From f0ca7d146e94c08dd1b79388e405813b1777c145 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 22 八月 2024 10:19:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/GrantCouponDto.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/GrantCouponDto.java b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/GrantCouponDto.java
index 7db26de..c81b666 100644
--- a/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/GrantCouponDto.java
+++ b/ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/dto/GrantCouponDto.java
@@ -9,6 +9,8 @@
 @Data
 @ApiModel("管理后台发放优惠券DTO")
 public class GrantCouponDto {
+    @ApiModelProperty("类型 1按用户标签 2按用户所在地 3自定义发放")
+    private Integer type;
     @ApiModelProperty("用户ids 逗号分隔")
     private String userIds;
     @ApiModelProperty("优惠券id")
@@ -17,4 +19,9 @@
     private Integer waysToObtain;
     @ApiModelProperty("结束时间 前端忽略")
     private LocalDateTime endTime;
+    @ApiModelProperty("标签ids")
+    private String tags;
+
+    @ApiModelProperty("市code 多个逗号分割")
+    private String cityCode;
 }

--
Gitblit v1.7.1