Merge branch 'cjl' into qa

cjl

2023-10-07 8b5439ba2748f91720975f73e7479a751d6a452b

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

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


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

}