Merge branch 'dev_1_3_2_20220815'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityPlanReward.java

@@ -14,6 +14,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 
 /**
  * 活动计划奖品表
@@ -36,7 +37,7 @@ public class ActivityPlanReward implements Serializable {
     @ApiModelProperty("奖品数量 ")
 	@TableField(value = "reward_num_")
     @NotNull(message = "奖品数量不能为空")
-    @Positive(message = "奖品数量必须大于0")
+    @PositiveOrZero(message = "奖品数量必须大于等于0")
     private Integer rewardNum;
     @ApiModelProperty("创建时间 ")
 	@TableField(value = "create_time_")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityReward.java

@@ -18,6 +18,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Positive;
+import javax.validation.constraints.PositiveOrZero;
 
 
 /**
@@ -56,7 +57,7 @@ public class ActivityReward implements Serializable {
     @ApiModelProperty("库存数 ")
     @TableField(value = "stock_")
     @NotNull(message = "库存数不能为空")
-    @Positive(message = "库存数必须大于0")
+    @PositiveOrZero(message = "库存数必须大于等于0")
     private Integer stock;
     @ApiModelProperty("数量（每个奖品） ")
     @TableField(value = "num_")