From cc1181b93c51c60a117846f9640d3f56370e67f3 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 03 八月 2023 13:32:26 +0800
Subject: [PATCH] Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponPageVo.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 8930402..abcf17c 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,10 +67,10 @@
@ApiModelProperty(value = "折扣百分比",hidden = true)
private BigDecimal discountPercent;
- @ApiModelProperty("创建时间")
+ @ApiModelProperty(value="创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @ApiModelProperty("拒绝理由")
+ @ApiModelProperty(value="拒绝理由")
private String auditReason;
}
--
Gitblit v1.7.1