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

kaiyu

2021-06-28 e702400b2e1bfd27f6176ea95a5c4d130417a1a4

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

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

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


}