Merge remote-tracking branch 'origin/cjl' into qa

cjl

2023-07-24 72b62513dbb8621658628a07001c5a159c130738

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

@@ -60,10 +60,4 @@
     */
    private String isDelete;


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

}