From bd8b3f8e4b5d8af99f267eb5c6efaac03406c620 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 26 Sep 2023 20:03:01 +0800
Subject: [PATCH] Merge branch 'wb' into qa

---
 screen-manage/src/main/java/com/moral/api/pojo/dto/organization/OrganizationDTO.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/pojo/dto/organization/OrganizationDTO.java b/screen-manage/src/main/java/com/moral/api/pojo/dto/organization/OrganizationDTO.java
index 0219df6..3217469 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/dto/organization/OrganizationDTO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/dto/organization/OrganizationDTO.java
@@ -36,5 +36,10 @@
     * */
     private Organization parentOrganization;
 
+    /*
+    * admin������
+    * */
+    private User adminUser;
+
 
 }

--
Gitblit v1.8.0