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

cjl

2023-08-23 5f7d27060aeca3f23737db21e06fc07c8e28f1a8

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


}