From d254385484b2baf2b4c76388e93bb850c9a6e2b3 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 10 May 2021 14:53:00 +0800
Subject: [PATCH] screen-manage                 添加组织返回字段

---
 screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationVO.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationVO.java
index a68785e..766d33a 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/organization/OrganizationVO.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.moral.api.pojo.dto.organization.OrganizationDTO;
+import com.moral.api.pojo.vo.user.UserVO;
 import com.moral.constant.ResponseCodeEnum;
 import lombok.Data;
 
@@ -13,7 +14,7 @@
  * @Version TODO
  **/
 @Data
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
+//@JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class OrganizationVO {
 
     private Integer id;
@@ -46,6 +47,8 @@
 
     private String wechat;
 
+    private String adminUserAccount;
+
     private String expireTime;
 
     private String createTime;
@@ -54,4 +57,6 @@
 
     private String isDelete;
 
+    private UserVO adminUser;
+
 }

--
Gitblit v1.8.0