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

cjl

2023-11-15 f6eada9ffd2fe2b8fdf45e2cc51d4290704ab24a

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

@@ -55,9 +55,6 @@
    private String desc;


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


}