Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev

kaiyu

2021-08-31 2f3b185bf448a18d61a0dfae4e97b22c3f4cdef7

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

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

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


}