From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

---
 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponGetVo.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponGetVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponGetVo.java
index f806790..bed7d05 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponGetVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerCouponGetVo.java
@@ -22,10 +22,10 @@
     @ApiModelProperty(value = "优惠券id 新增不传")
     private String couponId;
 
-    @ApiModelProperty("优惠券类型1.满减2.折扣3.代金4.商品")
+    @ApiModelProperty(value="优惠券类型1.满减2.折扣3.代金4.商品")
     private Integer couponType;
 
-    @ApiModelProperty("优惠券名称")
+    @ApiModelProperty(value="优惠券名称")
     private String couponName;
 
     @ApiModelProperty(value = "发送类型1.手动领取2.指定发放")
@@ -34,10 +34,10 @@
     @ApiModelProperty(value = "发送对象2.全部用户3.会员用户4非会员用户5自定义")
     private Integer sendTarget;
 
-    @ApiModelProperty("发送时间类型1立即2定时")
+    @ApiModelProperty(value="发送时间类型1立即2定时")
     private Integer sendTimeType;
 
-    @ApiModelProperty("发送时间")
+    @ApiModelProperty(value="发送时间")
     private Date sendTime;
 
     @ApiModelProperty(value = "使用范围1.全场2.指定商品")

--
Gitblit v1.7.1