From 98933984fa1353d298a5117fb2a2d044fc51af93 Mon Sep 17 00:00:00 2001
From: rentaiming <806181662@qq.com>
Date: 星期六, 22 六月 2024 13:18:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/dto/MgtCouponDTO.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/dto/MgtCouponDTO.java b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/dto/MgtCouponDTO.java
index 27dd76c..b216db7 100644
--- a/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/dto/MgtCouponDTO.java
+++ b/ruoyi-modules/ruoyi-promotion/src/main/java/com/ruoyi/promotion/controller/management/dto/MgtCouponDTO.java
@@ -4,7 +4,7 @@
import com.ruoyi.common.core.enums.CouponTypeEnum;
import com.ruoyi.common.core.enums.DistributionMethodEnum;
import com.ruoyi.system.api.validate.InsertGroup;
-import com.ruoyi.system.api.validate.ModifyGroup;
+import com.ruoyi.system.api.validate.UpdateGroup;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
@@ -26,11 +26,11 @@
private static final long serialVersionUID = 471073836029292058L;
@ApiModelProperty(value = "优惠券id", notes = "添加不传，更新必传")
- @NotNull(message = "优惠券id不能为空", groups = {ModifyGroup.class})
+ @NotNull(message = "优惠券id不能为空", groups = {UpdateGroup.class})
private Long id;
@ApiModelProperty(value = "优惠券名称")
- @NotBlank(message = "优惠券名称不能为空", groups = {InsertGroup.class, ModifyGroup.class})
+ @NotBlank(message = "优惠券名称不能为空", groups = {InsertGroup.class, UpdateGroup.class})
private String couponName;
@ApiModelProperty(value = "优惠券类型 1=满减券 2=代金券 3=折扣券")
@@ -53,7 +53,7 @@
private BigDecimal maxDiscount;
@ApiModelProperty(value = "优惠券说明")
- @NotBlank(message = "优惠券说明不能为空", groups = {InsertGroup.class, ModifyGroup.class})
+ @NotBlank(message = "优惠券说明不能为空", groups = {InsertGroup.class, UpdateGroup.class})
private String description;
@ApiModelProperty(value = "有效期起")
--
Gitblit v1.7.1