From 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期一, 07 六月 2021 09:28:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/test_future_wangge' into test_future_wangge --- springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java | 39 +++++++++++++++++++++++++++++++++++---- 1 files changed, 35 insertions(+), 4 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 8dd8643..546291a 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.annotation.*; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -10,20 +11,19 @@ /** * 用户对象 sys_user - * + * * @author HAUGNHONGFA */ @Data @TableName("sys_user") -public class SysUserDO implements Serializable -{ +public class SysUserDO implements Serializable { private static final long serialVersionUID = 1L; /** * user_id */ - @TableId(type=IdType.AUTO) + @TableId(type = IdType.AUTO) private Long userId; /** @@ -160,5 +160,36 @@ */ private Integer continuousLandingDays; + /** + * 小程序首页是否显示公告(1.是 2.否) + */ + private Integer isTips; + + + /** + * 证件照(人像面)照片 + */ + private String cardPhotoFront; + /** + * 证件照(国徽面)照片 + */ + private String cardPhotoBack; + + /** + * 户口本照片 逗号隔开 + */ + private String familyBook; + /** + * 网格员工作状态(1.在岗 2.脱岗 3.已下班) + */ + private Integer workStatus; + /** + * 网格员上班开始时间 + */ + private Integer workStartTime; + /** + * 网格员上班结束时间 + */ + private Integer workEndTime; } -- Gitblit v1.7.1