From 3d24cd1458df38d6556c33f9b513b8f4df976626 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 01 十一月 2024 17:09:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/dto/VipInfoDto.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 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..be390c2 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
@@ -9,15 +9,22 @@
import java.util.List;
@Data
public class VipInfoDto {
-
+ private Integer id;
@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,8 @@
@ApiModelProperty(value = "最高总折扣")
private BigDecimal totalDiscount;
+
+ @ApiModelProperty(value = "会员名称")
+ private String name;
+ private Integer type;
}
--
Gitblit v1.7.1