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

cjl

2023-07-08 1b45197a985684d930ee2ca58635d89bae6b6da8

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

@@ -69,9 +69,6 @@
    private String isDelete;


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


}