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

kaiyu

2021-06-18 4ad67c20b9c5e6625babefeee59ccee155cfc3aa

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

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

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


}