From a6d6627a6e13aef60941337a270541f507d53ba7 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 15 十二月 2023 09:36:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java
index ee02471..5a769c6 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncParkServiceImpl.java
@@ -51,7 +51,7 @@
         List<Parks> allList = parksMapper.selectList(null);
             //鍒嗛〉閬嶅巻寰幆鏌ヨ鎵�鏈夐棬绂佽澶囨暟鎹�
         param = new ParkListRequest();
-        BaseResponse<List<ParkListResponse>> response = hkService.parkList(param);
+        BaseResponse<List<ParkListResponse>> response = HKService.parkList(param);
         if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
             throw  new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝娴峰悍鍚屾鏁版嵁澶辫触~");
         }
@@ -105,8 +105,8 @@
         model.setIsdeleted(Constants.ZERO);
         model.setName(device.getParkName());
         model.setHkDate(date);
-        model.setCreateDate(DateUtil.StringToDate2(device.getCreateTime()));
-        model.setEditDate(DateUtil.StringToDate2(device.getUpdateTime()));
+        model.setCreateDate(DateUtil.getISO8601DateByStr(device.getCreateTime()));
+        model.setEditDate(DateUtil.getISO8601DateByStr(device.getUpdateTime()));
         model.setHkId(device.getParkIndexCode());
         model.setHkStatus(Constants.ONE);
         return  model;

--
Gitblit v1.9.3