From a9f950c0d11a687a7a940443b8c765f6d87ae4f1 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:26:22 +0800
Subject: [PATCH] 合并新的修改
---
zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysCheckInfoServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysCheckInfoServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysCheckInfoServiceImpl.java
index ab3de29..3fec040 100644
--- a/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysCheckInfoServiceImpl.java
+++ b/zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysCheckInfoServiceImpl.java
@@ -13,7 +13,7 @@
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.plugin.util.CollectionUtils;
-import com.matrix.system.hive.plugin.util.DateUtils;
+import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.plugin.util.MoneyUtil;
import com.matrix.system.hive.service.CodeService;
import com.matrix.system.hive.service.SysCheckInfoService;
@@ -149,10 +149,10 @@
@Override
public List<SysCheckInfo> findInPage(SysCheckInfo sysCheckInfo, PaginationVO pageVo) {
// 设置开始开始时间
- Date startDate = DateUtils.getStartDate(sysCheckInfo.getStartTime());
+ Date startDate = DateUtil.getStartDate(sysCheckInfo.getStartTime());
sysCheckInfo.setStartTime(startDate);
// 设置结束时间
- Date endDate = DateUtils.getEndDate(sysCheckInfo.getEndTime());
+ Date endDate = DateUtil.getEndDate(sysCheckInfo.getEndTime());
sysCheckInfo.setEndTime(endDate);
return sysCheckInfoDao.selectInPage(sysCheckInfo, pageVo);
}
--
Gitblit v1.9.1