Merge branch 'cjl' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-09-22 e8242c8c4b69a52bd49fd0b5b49333e1d227e405

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

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


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

}