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

jinpengyong

2023-08-25 5242d687d4edcd6c0f7e10fb82b0e5505dbb3da3

 screen-manage/src/main/java/com/moral/api/pojo/dto/organization/OrganizationDTO.java

@@ -35,13 +35,11 @@
    * 父组织
    * */
    private Organization parentOrganization;
    /*
    * 子组织
    * */
    private List<Organization> childOrganizations;

    /*
    * 管理员
    * admin账号
    * */
    private User admin;
    private User adminUser;


}