From f1bcbc43e988d0d1a91bea66a9ebbf6d601e48c0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 13 十月 2022 10:33:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsGameDTO.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsGameDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsGameDTO.java
index 332fb3c..d16c864 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsGameDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsGameDTO.java
@@ -5,6 +5,7 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.panzhihua.common.validated.AddGroup;
import com.panzhihua.common.validated.PutGroup;
@@ -39,13 +40,13 @@
@NotNull(groups = {AddGroup.class}, message = "游戏类别不能为空")
private Integer type;
- @ApiModelProperty("奖励类型（1.免费产品 2.免费服务）")
+ @ApiModelProperty("奖励类型（1.免费领 2.产品试用 3.消费赠礼 4.优惠券）")
private Integer awardType;
@ApiModelProperty("戳戳币分配方式（1.随机分配 2.平均分配）")
private Integer allocation;
- @ApiModelProperty("戳戳币总额")
+ @ApiModelProperty("戳戳币数量")
private Integer coins;
@ApiModelProperty("地址")
@@ -62,6 +63,7 @@
@ApiModelProperty("失效时间")
@NotNull(groups = {AddGroup.class}, message = "失效时间不能为空")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date expireAt;
@ApiModelProperty("封面")
--
Gitblit v1.7.1