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

kaiyu

2022-03-14 547b51661fefe8d7b88640b29a60db8874f5efac

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


}