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

cjl

2023-10-16 0eaefd62a7caa039a4f16e27be279eac5e84da5c

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

@@ -62,9 +62,4 @@
    private String desc;


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

}