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

jinpengyong

2023-08-23 b1bfa089b5b299c1c3c71094e450748a5e5e8a75

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

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

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


}