From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 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 cbf346c..4690102 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
@@ -29,11 +29,19 @@
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,7 +231,33 @@
@ApiModelProperty("办结事项名称")
private String transactionNames;
+ /**
+ * 微信小程序id
+ */
+ @ApiModelProperty("微信小程序id")
+ private String openid;
+
+ /**
+ * 待处理办事指南数量
+ */
+ @ApiModelProperty("待处理办事指南数量")
+ private Integer transactionNum;
+ @TableField(exist = false)
+ @ApiModelProperty("权限资格")
+ private String permission;
+
+ @TableField(exist = false)
+ @ApiModelProperty("角色名称")
+ private String roleName;
+
+
+ @TableField(exist = false)
+ @ApiModelProperty("创建人名称")
+ private String createName;
+
+ @ApiModelProperty("是否是部门领导（1是 2不是）")
+ private String isDivisionHead;
}
--
Gitblit v1.7.1