From c1ad05aac7afce802d70a07ecff8d5a39d545e6b Mon Sep 17 00:00:00 2001
From: bynt <13586541001@163.com>
Date: Mon, 25 Sep 2023 13:28:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=BE=E7=A4=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/distribute/service/impl/CustomServiceImpl.java     | 2 --
 .../main/java/com/baiye/modules/distribute/vo/CustomVO.java    | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java b/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java
index 01b4b87..23b0956 100644
--- a/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java
+++ b/admin/src/main/java/com/baiye/modules/distribute/service/impl/CustomServiceImpl.java
@@ -112,8 +112,6 @@ public class CustomServiceImpl extends ExtendServiceImpl<CustomMapper, CustomEnt
 				BeanUtils.copyProperties(customStore, customStoreVO);
 				if (map.containsKey(customStoreVO.getStoreId())) {
 					customStoreVO.setStoreName(map.get(customStoreVO.getStoreId()).get(0).getStoreName());
-					customStoreVO.setTradeStartTime(map.get(customStoreVO.getStoreId()).get(0).getTradeStartTime());
-					customStoreVO.setTradeEndTime(map.get(customStoreVO.getStoreId()).get(0).getTradeEndTime());
 				}
 				customStoreVOList.add(customStoreVO);
 			}
diff --git a/admin/src/main/java/com/baiye/modules/distribute/vo/CustomVO.java b/admin/src/main/java/com/baiye/modules/distribute/vo/CustomVO.java
index e67267e..68f1b32 100644
--- a/admin/src/main/java/com/baiye/modules/distribute/vo/CustomVO.java
+++ b/admin/src/main/java/com/baiye/modules/distribute/vo/CustomVO.java
@@ -1,5 +1,7 @@
 package com.baiye.modules.distribute.vo;
 
+import cn.hutool.core.date.DatePattern;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -51,6 +53,7 @@ public class CustomVO {
 	private LocalDateTime createTime;
 
 	@Schema(description = "分发时间")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DatePattern.NORM_DATETIME_PATTERN, timezone = "GMT+8")
 	private Date distributeTime;
 
 	@Schema(title = "门店信息")