Merge remote-tracking branch 'origin/dev' into wb

jinpengyong

2023-08-18 4a64c0801f147536ed0a9d09977941f313a286ae

 screen-api/src/main/java/com/moral/api/entity/Organization.java

@@ -125,9 +125,4 @@
    private String isDelete;


    @Override
    protected Serializable pkVal() {
        return this.id;
    }

}