From 486e2d4a76f2dce7edff272d12d5d98aec2e8bfe Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 七月 2025 20:39:12 +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 |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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 c1a7e59..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
@@ -4,7 +4,6 @@
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.List;
 
 /**
  * @ClassName AppUnGetCouponPageVo
@@ -32,8 +31,11 @@
     @ApiModelProperty(value ="优惠券关联商品",hidden = true)
     private String relGoodsIds;
 
-    @ApiModelProperty(value = "使用限制")
-    private List<String> goodsLimitList;
+    @ApiModelProperty(value = "商户限制")
+    private String shopLimit;
+
+    @ApiModelProperty(value = "商品限制")
+    private String goodsLimit;
 
     @ApiModelProperty(value = "门槛金额")
     private BigDecimal moneyThreshold;
@@ -44,4 +46,7 @@
     @ApiModelProperty(value = "折扣百分比")
     private BigDecimal discountPercent;
 
+    @ApiModelProperty(value = "有效期")
+    private String validTime;
+
 }

--
Gitblit v1.7.1