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

cjl

2023-09-06 d50faa74719f4d3f18ec9f99d99483f2c119c3a0

 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;


}