From 3ac9df9e72f1406cbfbd4c86b4d39d12f11b0701 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 14 十月 2021 11:07:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserVO.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 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 7fab819..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,11 +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
@@ -46,5 +47,30 @@
@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