From 5f3cf501f9f6c216df17ee8af6618b55b537d21a Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 21 十月 2022 16:57:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221014

---
 flower_city/src/main/java/com/dg/core/db/gen/entity/HuaChengSysUser.java |  285 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 285 insertions(+), 0 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/HuaChengSysUser.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/HuaChengSysUser.java
new file mode 100644
index 0000000..bcd42fa
--- /dev/null
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/HuaChengSysUser.java
@@ -0,0 +1,285 @@
+package com.dg.core.db.gen.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 此类为花城e+主体类
+ * 不可修改  切记!!!!!!!!!!!!!!!!!!
+ * 不可修改  切记!!!!!!!!!!!!!!!!!!
+ * 不可修改  切记!!!!!!!!!!!!!!!!!!
+ * 不可修改  切记!!!!!!!!!!!!!!!!!!
+ * 不可修改  切记!!!!!!!!!!!!!!!!!!
+ * 不可修改  切记!!!!!!!!!!!!!!!!!!
+ */
+@ApiModel("花城用户信息实体类")
+@Data
+@TableName("sys_user")
+public class HuaChengSysUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty(name = "userId", value = "主键用户id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableId(value = "user_id", type = IdType.AUTO)
+    private String userId;
+
+    /**
+     * 登录账户
+     */
+    @ApiModelProperty(name = "account", value = "登录账户")
+    private String account;
+
+    /**
+     * 登录密码
+     */
+    @ApiModelProperty(name = "password", value = "登录密码")
+    private String password;
+
+    /**
+     * 微信小程序唯一标识
+     */
+    @ApiModelProperty(name = "openid", value = "微信小程序唯一标识")
+    private String openid;
+
+    /**
+     * 会话密钥
+     */
+    @ApiModelProperty(name = "sessionKey", value = "会话密钥")
+    private String sessionKey;
+
+    /**
+     * 用户在开放平台的唯一标识符
+     */
+    @ApiModelProperty(name = "unionid", value = "用户在开放平台的唯一标识符")
+    private String unionid;
+
+    /**
+     * 手机号
+     */
+    @ApiModelProperty(name = "phone", value = "手机号")
+    private String phone;
+
+    /**
+     * 昵称
+     */
+    @ApiModelProperty(name = "nickName", value = "昵称")
+    private String nickName;
+
+    /**
+     * 真实名字
+     */
+    @ApiModelProperty(name = "name", value = "真实名字")
+    private String name;
+
+    /**
+     * 社区ID
+     */
+    @ApiModelProperty(name = "communityId", value = "社区ID")
+    private String communityId;
+
+    /**
+     * 性别 1 男 2 女
+     */
+    @ApiModelProperty(name = "sex", value = "性别 1 男 2 女")
+    private String sex;
+
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty(name = "idCard", value = "身份证号")
+    private String idCard;
+
+    /**
+     * 生日
+     */
+    @ApiModelProperty(name = "birthday", value = "生日")
+    private String birthday;
+
+    /**
+     * 头像
+     */
+    @ApiModelProperty(name = "imageUrl", value = "头像")
+    private String imageUrl;
+
+    /**
+     * 用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10 便民服务商家后台 11三说会堂后台 12行业分中心后台
+     */
+    @ApiModelProperty(name = "type", value = "用户类型 1 小程序 2 运营平台 3 社区平台 5 商家后台 6 网格综治APP 7 网格综治后台 8大屏 9城管后台 10 便民服务商家后台 11三说会堂后台 12行业分中心后台")
+    private String type;
+
+    /**
+     * 职业
+     */
+    @ApiModelProperty(name = "job", value = "职业")
+    private String job;
+
+    /**
+     * 是否志愿者 0 否 1 是
+     */
+    @ApiModelProperty(name = "isVolunteer", value = "是否志愿者 0 否 1 是")
+    private String isVolunteer;
+
+    /**
+     * 是否党员 0 否 1 是
+     */
+    @ApiModelProperty(name = "isPartymember", value = "是否党员 0 否 1 是")
+    private String isPartymember;
+
+    /**
+     * 1 启用 2 禁用
+     */
+    @ApiModelProperty(name = "status", value = "1 启用 2 禁用")
+    private String status;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(name = "createAt", value = "创建时间")
+    private String createAt;
+
+    /**
+     * 最后登录时间
+     */
+    @ApiModelProperty(name = "lastLoginTime", value = "最后登录时间")
+    private String lastLoginTime;
+
+    /**
+     * 标签多个用,隔开
+     */
+    @ApiModelProperty(name = "tags", value = "标签多个用,隔开")
+    private String tags;
+
+    /**
+     * 家庭id
+     */
+    @ApiModelProperty(name = "familyId", value = "家庭id")
+    private String familyId;
+
+    /**
+     * 人脸采集照片url
+     */
+    @ApiModelProperty(name = "faceUrl", value = "人脸采集照片url")
+    private String faceUrl;
+
+    /**
+     * 人脸采集审核状态 0 待审核 1 审核通过 2驳回
+     */
+    @ApiModelProperty(name = "faceState", value = "人脸采集审核状态 0 待审核 1 审核通过 2驳回")
+    private String faceState;
+
+    /**
+     * 驳回原因
+     */
+    @ApiModelProperty(name = "rejectReson", value = "驳回原因")
+    private String rejectReson;
+
+    /**
+     * 小区id
+     */
+    @ApiModelProperty(name = "areaId", value = "小区id")
+    private String areaId;
+
+    /**
+     * 证件照(人相面)照片
+     */
+    @ApiModelProperty(name = "cardPhotoFront", value = "证件照(人相面)照片")
+    private String cardPhotoFront;
+
+    /**
+     * 证件照(国徽面)照片
+     */
+    @ApiModelProperty(name = "cardPhotoBack", value = "证件照(国徽面)照片")
+    private String cardPhotoBack;
+
+    /**
+     * 户口本
+     */
+    @ApiModelProperty(name = "familyBook", value = "户口本")
+    private String familyBook;
+
+    /**
+     * 连续登陆天数 每天凌晨定时任务更新
+     */
+    @ApiModelProperty(name = "continuousLandingDays", value = "连续登陆天数 每天凌晨定时任务更新")
+    private String continuousLandingDays;
+
+    /**
+     * 小程序首页是否显示公告(1.是 2.否)
+     */
+    @ApiModelProperty(name = "isTips", value = "小程序首页是否显示公告(1.是 2.否)")
+    private String isTips;
+
+    /**
+     * 网格员工作状态(1.在岗 2.脱岗 3.已下班)
+     */
+    @ApiModelProperty(name = "workStatus", value = "网格员工作状态(1.在岗 2.脱岗 3.已下班)")
+    private String workStatus;
+
+    /**
+     * 网格员上班开始时间
+     */
+    @ApiModelProperty(name = "workStartTime", value = "网格员上班开始时间")
+    private String workStartTime;
+
+    /**
+     * 网格员上班结束时间
+     */
+    @ApiModelProperty(name = "workEndTime", value = "网格员上班结束时间")
+    private String workEndTime;
+
+    /**
+     * 高龄认证显示提示(1.是 2.否)
+     */
+    @ApiModelProperty(name = "bigAgeTips", value = "高龄认证显示提示(1.是 2.否)")
+    private String bigAgeTips;
+
+    /**
+     * 明文密码
+     */
+    @ApiModelProperty(name = "plaintextPassword", value = "明文密码")
+    private String plaintextPassword;
+
+    /**
+     * 街道id
+     */
+    @ApiModelProperty(name = "streetId", value = "街道id")
+    private String streetId;
+
+    /**
+     * 绑定单位
+     */
+    @ApiModelProperty(name = "relationName", value = "绑定单位")
+    private String relationName;
+
+    /**
+     *
+     */
+    @ApiModelProperty(name = "appId", value = "")
+    private String appId;
+
+    /**
+     * 是否接收推送
+     */
+    @ApiModelProperty(name = "isAccept", value = "是否接收推送")
+    private String isAccept;
+
+    /**
+     * 报到单位id
+     */
+    @ApiModelProperty(name = "bindingCheckUnitId", value = "报到单位id")
+    private String bindingCheckUnitId;
+
+}

--
Gitblit v1.7.1