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

cjl

2023-11-07 701539ca54bf08267bbf669188797669b9335811

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

@@ -36,5 +36,10 @@
    * */
    private Organization parentOrganization;

    /*
    * admin账号
    * */
    private User adminUser;


}