From 84e740f362d574b942b1c9a274425841c9167de8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 15 Nov 2023 08:27:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-manage/src/main/java/com/moral/api/pojo/dto/organization/OrganizationDTO.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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 071bf1a..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
@@ -35,13 +35,11 @@
* ���������
* */
private Organization parentOrganization;
- /*
- * ���������
- * */
- private List<Organization> childOrganizations;
/*
- * ���������
+ * admin������
* */
- private User admin;
+ private User adminUser;
+
+
}
--
Gitblit v1.8.0