From c62e9f81b2072473b084abb30f7c005ed341a336 Mon Sep 17 00:00:00 2001
From: hjl <1657978663@qq.com>
Date: 星期四, 06 六月 2024 15:05:34 +0800
Subject: [PATCH] feat: 修复代码冲突
---
ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/VipSetVO.java | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/VipSetVO.java b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/VipSetVO.java
index ff9046b..348c306 100644
--- a/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/VipSetVO.java
+++ b/ruoyi-service/ruoyi-management/src/main/java/com/ruoyi/management/vo/VipSetVO.java
@@ -17,11 +17,7 @@
*/
@Data
public class VipSetVO {
- /**
- * 会员说明
- */
- @ApiModelProperty(value = "会员说明")
- private String info;
+
@ApiModelProperty(value = "会员价格设置")
private List<TVipSet> list;
--
Gitblit v1.7.1