From 3940e5ebf6a2fecca5fc75c9e5d8a325c5842681 Mon Sep 17 00:00:00 2001
From: zhaozhengjie <237651143@qq.com>
Date: 星期日, 09 十月 2022 14:00:21 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
flower_city/src/main/java/com/dg/core/db/gen/entity/SysUser.java | 15 +++++++++++----
1 files changed, 11 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..42d30ea 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,18 @@
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")
private Long userId;
@@ -63,9 +70,9 @@
private String phonenumber;
/**
- * 用户性别（0男 1女 2未知）
+ * 性别 1 男 2 女
*/
- @ApiModelProperty("用户性别（0男 1女 2未知）")
+ @ApiModelProperty("性别 1 男 2 女")
private String sex;
/**
--
Gitblit v1.7.1