From 945561a655919045c3086f00d7d16dbc1d24c23f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 18 三月 2024 10:57:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java
index fb5da35..28edcc7 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java
@@ -6,7 +6,6 @@
import java.math.BigDecimal;
import java.util.Date;
-import java.util.List;
/**
* @ClassName AppMemberCouponPageVo
@@ -33,8 +32,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;
@@ -55,7 +57,7 @@
private Date deadlineTime;
@ApiModelProperty(value = "使用时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy.MM.dd HH:mm:ss")
private Date useTime;
@ApiModelProperty(value = "核销店铺")
--
Gitblit v1.7.1