From 179c4d64313c9b7572778da4aaaf6c6584fe457d Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:48:08 +0800
Subject: [PATCH] 修改文件上传类型限制

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsGameVO.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsGameVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsGameVO.java
index 77da505..da8f0de 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsGameVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsGameVO.java
@@ -2,6 +2,8 @@
 
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -32,7 +34,7 @@
     @ApiModelProperty("游戏类别(1.戳戳币游戏 2.体验游戏)")
     private Integer type;
 
-    @ApiModelProperty("奖励类型(1.免费产品 2.免费服务)")
+    @ApiModelProperty("奖励类型(1.免费领 2.产品试用 3.消费赠礼 4.优惠券)")
     private Integer awardType;
 
     @ApiModelProperty("戳戳币分配方式(1.随机分配 2.平均分配)")
@@ -40,6 +42,9 @@
 
     @ApiModelProperty("戳戳币总额")
     private Integer coins;
+
+    @ApiModelProperty("戳戳币剩余数量")
+    private Integer surplusCoins;
 
     @ApiModelProperty("地址")
     private String address;
@@ -51,6 +56,7 @@
     private String lon;
 
     @ApiModelProperty("失效时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date expireAt;
 
     @ApiModelProperty("封面")
@@ -69,11 +75,18 @@
     private Boolean isPopular;
 
     @ApiModelProperty("发布时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date publishAt;
 
     @ApiModelProperty("所属商家")
     private Long merchantId;
 
     @ApiModelProperty("所属商家名称")
-    private Long merchantName;
+    private String merchantName;
+
+    @ApiModelProperty("商家logo")
+    private String logo;
+
+    @ApiModelProperty("所属商家下游戏总数")
+    private Integer gameCount;
 }

--
Gitblit v1.7.1