Merge branch 'cjl' into qa

cjl

2023-08-23 ff35af8957b36ca638c6e8155db2303104515ff7

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

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


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

}