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

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

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

@@ -75,9 +75,5 @@
    private String desc;


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

}