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/MgtCouponAuditPageVo.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 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 4fc940f..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;
/**
@@ -18,6 +19,9 @@
@ApiModelProperty(value = "优惠券id")
private String couponId;
+
+ @ApiModelProperty(value="店铺id")
+ private Long shopId;
@ApiModelProperty(value="店铺名称")
private String shopName;
@@ -56,7 +60,7 @@
@ApiModelProperty(value = "发送时间")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sendTime;
@ApiModelProperty(value="创建时间")
@@ -65,5 +69,18 @@
@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