From 14f8be1a86a3d852b92665fcf4c767478c3e12d2 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 五月 2024 16:52:17 +0800
Subject: [PATCH] Merge branch 'master' into dev-mitao
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/Member.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/Member.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/Member.java
index b605bdc..b713f54 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/Member.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/Member.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.enums.GenderEnum;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -32,7 +33,7 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "会员id")
- @TableId(value = "id", type = IdType.INPUT)
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
private Long id;
@ApiModelProperty(value = "会员昵称")
@@ -51,7 +52,7 @@
private String phone;
@ApiModelProperty(value = "性别 0=女,1=男,2=未知")
- private Integer gender;
+ private GenderEnum gender;
@ApiModelProperty(value = "等级")
private Integer level;
--
Gitblit v1.7.1