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

cjl

2023-09-28 8eb4ae5aee53a2529c759d95dd529d91dd25ba1d

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

}