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

jinpengyong

2023-07-31 2b5e23042827c66c936d6aeaa004f42b95236d52

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

}