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

cjl

2023-11-10 0920f23406e52e4c7149515797a317c836c9e065

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

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

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


}