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/VolunteerMerchantVO.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantVO.java
index a4455d4..21c8043 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantVO.java
@@ -105,14 +105,12 @@
      * 营业开始时间
      */
     @ApiModelProperty(value = "营业开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date businessStartTime;
+    private String businessStartTime;
     /**
      * 营业结束时间
      */
     @ApiModelProperty(value = "营业结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date businessEndTime;
+    private String businessEndTime;
     /**
      * 活动名称
      */
@@ -148,5 +146,9 @@
     @ApiModelProperty(value = "商家类型名称")
     private String merchantTypeName;
 
+    @ApiModelProperty(value = "商家评分")
+    private String merchantGrade;
 
+    @ApiModelProperty(value = "商家积分")
+    private String merchantIntegral;
 }

--
Gitblit v1.7.1