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

jinpengyong

2023-08-25 1267661c4028d4adb6629b3c6f00c686aa35eb8a

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

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


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

}