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

cjl

2023-10-14 4a50bd93dfcdedb85f117d25f89e67291eb65cf7

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

}