From 438038d5cd4f27b88236cac429cfaeaae5759b56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E7=AB=B9=E7=BA=A2?= Date: Sun, 25 Jun 2023 15:12:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=98=E5=8C=BA=E6=97=B6=E9=97=B4=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/vo/ZoneVO.java | 2 +- .../java/com/cool/store/service/impl/ZoneServiceImpl.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/ZoneVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/ZoneVO.java index 6c0a922bb..e2dd21adf 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/ZoneVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/ZoneVO.java @@ -17,7 +17,7 @@ public class ZoneVO { private String zoneName; - private Date updateTime; + private String updateTime; private String updateUserId; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java index f5a4bc468..bfab00aef 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/ZoneServiceImpl.java @@ -1,5 +1,6 @@ package com.cool.store.service.impl; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; import com.cool.store.dao.*; import com.cool.store.dto.partner.ZoneCheckDTO; @@ -11,6 +12,7 @@ import com.cool.store.enums.ErrorCodeEnum; import com.cool.store.exception.ServiceException; import com.cool.store.request.IntentAreaSettingRequest; import com.cool.store.service.ZoneService; +import com.cool.store.utils.CoolDateUtils; import com.cool.store.utils.StringUtil; import com.cool.store.vo.OpenAreaSingleVO; import com.cool.store.vo.OrganizationVO; @@ -168,7 +170,7 @@ public class ZoneServiceImpl implements ZoneService { ZoneVO zoneVO = new ZoneVO(); zoneVO.setZoneName(hyIntendDevZoneInfoDO.getZoneName()); zoneVO.setId(hyIntendDevZoneInfoDO.getId()); - zoneVO.setUpdateTime(hyIntendDevZoneInfoDO.getUpdateTime()); + zoneVO.setUpdateTime(DateUtil.format(hyIntendDevZoneInfoDO.getUpdateTime(), CoolDateUtils.DATE_FORMAT_SEC)); List organizationVOS = new ArrayList<>(); if (StringUtil.isNotEmpty(hyIntendDevZoneInfoDO.getAssociatedRegionId())){ List regionIds = JSONObject.parseArray(hyIntendDevZoneInfoDO.getAssociatedRegionId(), String.class);