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

jinpengyong

2023-09-28 5eb88939c094fac1f5dc9201b5af6da4165cc185

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

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


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

}