From f342a0d88b2a7168f794d0cf545d16a3138acb6d Mon Sep 17 00:00:00 2001
From: wuqiping <wuqiping@qq.com>
Date: Wed, 09 Jun 2021 15:55:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
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