From 13a4a6b0afcef564abd62aa244a3d89bfda5f72b Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 九月 2024 10:07:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/VipInfoDto.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/VipInfoDto.java b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/VipInfoDto.java
index 548a8e3..86e0ed5 100644
--- a/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/VipInfoDto.java
+++ b/ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/VipInfoDto.java
@@ -12,10 +12,16 @@
 
     @ApiModelProperty("月卡价格")
     private BigDecimal monthlyCard;
+    @ApiModelProperty(value = "月卡折扣")
+    private BigDecimal monthlyCardDiscount;
     @ApiModelProperty("季卡价格")
     private BigDecimal seasonCard;
+    @ApiModelProperty(value = "季卡折扣")
+    private BigDecimal seasonCardDiscount;
     @ApiModelProperty("年卡价格")
     private BigDecimal annualCard;
+    @ApiModelProperty(value = "年卡折扣")
+    private BigDecimal annualCardDiscount;
     @ApiModelProperty("最高抵扣价格")
     private BigDecimal maximumDeduction;
     private BigDecimal timeAmount;

--
Gitblit v1.7.1