From c3811d01d1929a98a0f34f70ca187d82ee312dbb Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期三, 03 十一月 2021 17:26:50 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java
index 080c2e3..efc62d2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java
@@ -1,10 +1,12 @@
package com.panzhihua.common.model.vos.user;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-import java.util.Date;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -25,6 +27,9 @@
@ApiModelProperty("昵称")
private String nickName;
+ @ApiModelProperty("身份证号码")
+ private String idCard;
+
@ApiModelProperty("真实名字")
private String name;
@@ -35,10 +40,37 @@
private Integer status;
@ApiModelProperty("创建时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createAt;
@ApiModelProperty("最后登录时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date lastLoginTime;
+ @ApiModelProperty("用户类型（用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10一键报警app）")
+ private Integer type;
+
+ @ApiModelProperty("是否是志愿者（0.否 1.是）")
+ private Integer isVolunteer;
+
+ @ApiModelProperty("是否是党员（0.否 1.是）")
+ private Integer isPartymember;
+
+ /**
+ * 用户类型（用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10一键报警app）
+ */
+ public interface type{
+ int xcx = 1;
+ int yyht = 2;
+ int sqht = 3;
+ }
+
+ /**
+ * 是否枚举（0.否 1.是）
+ */
+ public interface isOk{
+ int yes = 1;
+ int no = 0;
+ }
}
--
Gitblit v1.7.1