From e6f974ca6eab798c2df5c09cdb8320ecf4ff4185 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 22 Aug 2023 16:52:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb_21
---
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