From 3f4d70ff9ba7e22bf165a124d860327a92ccdfd0 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Dec 2020 16:12:39 +0800
Subject: [PATCH] fix instore two bugs

---
 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