From 4e5ecd152044d53cc5853037eb60361fff4d11dc Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Mon, 14 Dec 2020 21:46:36 +0800
Subject: [PATCH] Merge branch 'master' into ty_urgent
---
zq-erp/src/main/java/com/matrix/core/tools/DateUtil.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/core/tools/DateUtil.java b/zq-erp/src/main/java/com/matrix/core/tools/DateUtil.java
index 4fdaef7..419bddf 100644
--- a/zq-erp/src/main/java/com/matrix/core/tools/DateUtil.java
+++ b/zq-erp/src/main/java/com/matrix/core/tools/DateUtil.java
@@ -720,7 +720,7 @@
targetDate = calendar.getTime();
break;
default:
- targetDate = new Date();
+ targetDate = stringToDate("9999-12-31", DATE_FORMAT_DD);
}
--
Gitblit v1.9.1