From dfe41d5fa39a2fc3c25689c2c6152ae8fa476bce Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 29 八月 2023 15:36:30 +0800
Subject: [PATCH] 新增商家详情接口   修改查询用户信息报错

---
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/VolunteerMerchantVO.java |    6 ++----
 1 files changed, 2 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..c445a8c 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;
     /**
      * 活动名称
      */

--
Gitblit v1.7.1