From 3cb59ae9ddc31e62988e5c7feb6647b44f1c7cf8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 17 一月 2025 17:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AgentApplication.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AgentApplication.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AgentApplication.java
index 2fafda8..4904142 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AgentApplication.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AgentApplication.java
@@ -36,6 +36,10 @@
@ApiModelProperty(value = "用户id")
@TableField("app_user_id")
private Long appUserId;
+
+ @ApiModelProperty(value = "当前vip")
+ @TableField("vip_id")
+ private Integer vipId;
@ApiModelProperty(value = "申请类型 对应vip_id")
@TableField("application_vip_id")
@@ -94,8 +98,5 @@
@TableField(exist = false)
private String idStr;
- @TableField(exist = false)
- private Integer vipId;
-
}
--
Gitblit v1.7.1