From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponPageVo.java | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponPageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponPageVo.java
index d519be4..47a4a74 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponPageVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponPageVo.java
@@ -19,10 +19,10 @@
@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 = "使用限制")
@@ -55,6 +55,9 @@
@ApiModelProperty(value = "发送对象")
private String sendTarget;
+ @ApiModelProperty(value = "领取限制数量 0为不限")
+ private Integer limitNumber;
+
@ApiModelProperty(value = "门槛金额",hidden = true)
private BigDecimal moneyThreshold;
@@ -64,8 +67,20 @@
@ApiModelProperty(value = "折扣百分比",hidden = true)
private BigDecimal discountPercent;
- @ApiModelProperty("创建时间")
+ @ApiModelProperty(value="创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
+ @ApiModelProperty(value="拒绝理由")
+ private String auditReason;
+
+ @ApiModelProperty(value = "优惠券二维码")
+ private String couponCode;
+
+ @ApiModelProperty(value = "宣传海报")
+ private String propagandaPoster;
+
+ @ApiModelProperty(value = "发放限制数量")
+ private Integer sendLimitNumber;
+
}
--
Gitblit v1.7.1