From a4fc8d1a88374ee4e1aba8acde5567e0abe9f659 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 30 八月 2024 09:50:40 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/VipInfoDto.java |   10 ++++++++++
 1 files changed, 10 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 0783c96..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,12 +12,19 @@
 
     @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;
     @ApiModelProperty("抵扣次数")
     private Integer discountTimes;
 
@@ -32,4 +39,7 @@
 
     @ApiModelProperty(value = "最高总折扣")
     private BigDecimal totalDiscount;
+
+    @ApiModelProperty(value = "会员名称")
+    private String name;
 }

--
Gitblit v1.7.1