From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 11:11:02 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppGetAbleCouponPageVo.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppGetAbleCouponPageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppGetAbleCouponPageVo.java
index 6e272d5..5464387 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppGetAbleCouponPageVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppGetAbleCouponPageVo.java
@@ -19,14 +19,23 @@
@ApiModelProperty(value = "优惠券id")
private String couponId;
- @ApiModelProperty("优惠券名称")
+ @ApiModelProperty(value = "优惠券名称")
private String couponName;
- @ApiModelProperty("优惠券类型1.满减2.折扣3.代金4.商品")
+ @ApiModelProperty(value = "优惠券类型1.满减2.折扣3.代金4.商品")
private Integer couponType;
- @ApiModelProperty(value = "使用限制")
- private String shopName;
+ @ApiModelProperty(value ="优惠券关联商户",hidden = true)
+ private Long shopId;
+
+ @ApiModelProperty(value ="优惠券关联商品",hidden = true)
+ private String relGoodsIds;
+
+ @ApiModelProperty(value = "商户限制")
+ private String shopLimit;
+
+ @ApiModelProperty(value = "商品限制")
+ private String goodsLimit;
@ApiModelProperty(value = "门槛金额")
private BigDecimal moneyThreshold;
@@ -37,4 +46,7 @@
@ApiModelProperty(value = "折扣百分比")
private BigDecimal discountPercent;
+ @ApiModelProperty(value = "有效期")
+ private String validTime;
+
}
--
Gitblit v1.7.1