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

cjl

2023-10-20 c7dd4a195d8d893d92c49963447cdf6486844584

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

}