From 6256203540690d3cf0ebf99f3cb5fa373187c8fc Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 二月 2025 17:04:30 +0800
Subject: [PATCH] 解决冲突
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java
index 020a245..7421e35 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/Member.java
@@ -81,10 +81,7 @@
@ApiModelProperty(value = "支付宝openid")
private String zfbOpenid;
-
- @ApiModelProperty(value = "会员分类(1:普通用户；2：会员用户；3：超级会员用户)")
- private Integer vipClassify;
-
+
@ApiModelProperty(value = "创建者")
@TableField(value = "create_by", fill = FieldFill.INSERT)
private String createBy;
@@ -114,6 +111,7 @@
@ApiModelProperty(value = "用户消费金额")
private BigDecimal money;
-
-
+
+ @ApiModelProperty(value = "会员分类(1：普通用户；2：会员用户；3：超级会员用户；)")
+ private Integer vipClassify;
}
--
Gitblit v1.7.1