From 71df1c0a0a92ac0635e579d6a77d9ced7e9ccf23 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 14:38:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java b/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
index 66bbb71..704b993 100644
--- a/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
+++ b/flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java
@@ -24,16 +24,24 @@
*/
@ApiModel("用户信息实体类")
@Data
-@TableName("sys_user")
+@TableName("automessage_sys_user")
public class SysUser implements Serializable {
private static final long serialVersionUID = 1L;
/**
- * 用户ID
+ * 主键id
*/
@ApiModelProperty("主键id")
@JsonSerialize(using = ToStringSerializer.class)
- @TableId(value = "user_id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+
+ /**
+ * 用户id
+ */
+ @ApiModelProperty("用户id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long userId;
@@ -63,9 +71,9 @@
private String phonenumber;
/**
- * 用户性别（0男 1女 2未知）
+ * 性别 1 男 2 女
*/
- @ApiModelProperty("用户性别（0男 1女 2未知）")
+ @ApiModelProperty("性别 1 男 2 女")
private String sex;
/**
@@ -223,6 +231,18 @@
@ApiModelProperty("办结事项名称")
private String transactionNames;
+ /**
+ * 微信小程序id
+ */
+ @ApiModelProperty("微信小程序id")
+ private String openid;
+
+ /**
+ * 待处理办事指南数量
+ */
+ @ApiModelProperty("待处理办事指南数量")
+ private Integer transactionNum;
+
--
Gitblit v1.7.1