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

cjl

2023-10-20 fb89f40499211dae5d74caf3cea2ea696745e7a2

 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;
    }


}