From 947d016e4bd349b78d540e3a869f55d68b2c610c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 08 十一月 2022 18:16:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java
index e8d0f01..2c07327 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java
@@ -1,13 +1,11 @@
package com.panzhihua.service_user.model.dos;
-
-import com.baomidou.mybatisplus.annotation.*;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
import java.io.Serializable;
import java.util.Date;
-import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import lombok.Data;
/**
* 用户对象 sys_user
@@ -23,7 +21,7 @@
/**
* user_id
*/
- @TableId(type = IdType.AUTO)
+ @TableId(type = IdType.ASSIGN_ID)
private Long userId;
/**
@@ -165,7 +163,6 @@
*/
private Integer isTips;
-
/**
* 证件照（人像面）照片
*/
@@ -179,5 +176,40 @@
* 户口本照片 逗号隔开
*/
private String familyBook;
+ /**
+ * 网格员工作状态(1.在岗 2.脱岗 3.已下班)
+ */
+ private Integer workStatus;
+ /**
+ * 网格员上班开始时间
+ */
+ private Integer workStartTime;
+ /**
+ * 网格员上班结束时间
+ */
+ private Integer workEndTime;
+ /**
+ * 高龄认证显示提示（1.是 2.否）
+ */
+ private Integer bigAgeTips;
+ /**
+ * 明文密码
+ */
+ private String plaintextPassword;
+ /**
+ * 街道id
+ */
+ private Long streetId;
+
+ /**
+ * 绑定单位
+ */
+ private String relationName;
+
+ private String appId;
+
+ private Integer isAccept;
+
+ private Long bindingCheckUnitId;
}
--
Gitblit v1.7.1