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/MgtCouponAuditPageVo.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtCouponAuditPageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtCouponAuditPageVo.java
index 11dec5c..9ca4a79 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtCouponAuditPageVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtCouponAuditPageVo.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -19,10 +20,13 @@
@ApiModelProperty(value = "优惠券id")
private String couponId;
- @ApiModelProperty("店铺名称")
+ @ApiModelProperty(value="店铺id")
+ private Long shopId;
+
+ @ApiModelProperty(value="店铺名称")
private String shopName;
- @ApiModelProperty("优惠券名称")
+ @ApiModelProperty(value="优惠券名称")
private String couponName;
@@ -56,14 +60,27 @@
@ApiModelProperty(value = "发送时间")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendTime;
- @ApiModelProperty("创建时间")
+ @ApiModelProperty(value="创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- @ApiModelProperty("审核状态1申请中2审核通过3审核拒绝")
+ @ApiModelProperty(value="审核状态1申请中2审核通过3审核拒绝")
private String auditStatus;
+ @ApiModelProperty(value = "优惠券类型(1.满减2.折扣3.代金4.商品5.抽奖领取)")
+ private String couponType;
+ @ApiModelProperty(value = "使用限制")
+ private String useLimit;
+
+ @ApiModelProperty(value = "门槛金额",hidden = true)
+ private BigDecimal moneyThreshold;
+
+ @ApiModelProperty(value = "折扣金额",hidden = true)
+ private BigDecimal discountMoney;
+
+ @ApiModelProperty(value = "折扣百分比",hidden = true)
+ private BigDecimal discountPercent;
}
--
Gitblit v1.7.1