From 8059e9b991c15edbac508e6b658a0d9571d11b1c Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期五, 01 八月 2025 12:46:00 +0800 Subject: [PATCH] bug修改 --- ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java | 13 +++++++++---- 1 files changed, 9 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..bb7d982 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 @@ -20,6 +19,9 @@ @ApiModelProperty(value = "用户优惠券id") private String memberCouponId; + + @ApiModelProperty(value = "优惠券id") + private String couponId; @ApiModelProperty(value = "优惠券名称") private String couponName; @@ -33,8 +35,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 +60,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