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

cjl

2023-09-12 87c10f8ad1cd11d126dabeea6071cdee617dbfa5

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

@@ -55,9 +55,4 @@
    private String isDelete;


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

}