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/MgtCouponPageVo.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtCouponPageVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtCouponPageVo.java
index 1fa13cd..e13b637 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtCouponPageVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtCouponPageVo.java
@@ -20,10 +20,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 String couponType;
@ApiModelProperty(value = "使用限制")
@@ -45,7 +45,7 @@
private String validTime;
@ApiModelProperty(value = "发放张数")
- private Integer sendCount;
+ private String sendCount;
@ApiModelProperty(value = "使用范围")
private String useScope;
@@ -65,7 +65,7 @@
@ApiModelProperty(value = "折扣百分比",hidden = true)
private BigDecimal discountPercent;
- @ApiModelProperty("创建时间")
+ @ApiModelProperty(value="创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
--
Gitblit v1.7.1