From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Fri, 27 May 2022 19:48:02 +0800 Subject: [PATCH] Merge branch 'developer' into hive2.0 --- zq-erp/src/main/java/com/matrix/system/hive/action/CheckInfoDetailController.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/hive/action/CheckInfoDetailController.java b/zq-erp/src/main/java/com/matrix/system/hive/action/CheckInfoDetailController.java index 00e9dfb..8211e02 100644 --- a/zq-erp/src/main/java/com/matrix/system/hive/action/CheckInfoDetailController.java +++ b/zq-erp/src/main/java/com/matrix/system/hive/action/CheckInfoDetailController.java @@ -11,9 +11,10 @@ import com.matrix.core.pojo.AjaxResult; import com.matrix.core.pojo.PaginationVO; + +import com.matrix.core.tools.DateUtil; import com.matrix.system.hive.bean.SysCheckDetail; import com.matrix.system.hive.bean.SysCheckInfo; -import com.matrix.system.hive.plugin.util.DateUtils; import com.matrix.system.hive.plugin.util.ExcelUtil; import com.matrix.system.hive.service.CodeService; import com.matrix.system.hive.service.SysCheckDetailService; @@ -102,7 +103,7 @@ temp1.add(checkInfo.getCheckType()); temp1.add(checkInfo.getCheckNo()); // 时间转为字符串 - String strDate = DateUtils.dateToString(checkInfo.getCheckDate(), DateUtils.DATE_FORMAT_DD); + String strDate = DateUtil.dateToString(checkInfo.getCheckDate(), DateUtil.DATE_FORMAT_DD); temp1.add(strDate); temp1.add(checkInfo.getMakingManName()); temp1.add(checkInfo.getAppManName()); -- Gitblit v1.9.1