From d6a0a1bb4c7b27a6521c969046cb969b168fa93a Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 07 Jun 2021 10:11:08 +0800
Subject: [PATCH] screen-manage 更新组织删除逻辑，存在站点或者子组织存在站点则无法删除。
---
screen-manage/src/main/java/com/moral/api/pojo/vo/user/UserVO.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/user/UserVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/user/UserVO.java
index 84eca6e..7d0a715 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/user/UserVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/user/UserVO.java
@@ -11,19 +11,23 @@
* @Version TODO
**/
@Data
-@JsonInclude(JsonInclude.Include.NON_EMPTY)
+//@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class UserVO {
private Integer id;
private String account;
+ private String userName;
+
private String organizationName;
private String email;
private String mobile;
+ private String wechat;
+
private String createTime;
private String expireTime;
--
Gitblit v1.8.0