From 64c92e244f2cdcb5c3e46f20de55bf417248d683 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Fri, 15 Apr 2022 21:35:44 +0800
Subject: [PATCH] Merge branch 'developer'
---
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 07a0984..01df901 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 = stringToDate("9999-12-31", DATE_FORMAT_DD);
+ targetDate = stringToDate("2099-12-31", DATE_FORMAT_DD);
}
--
Gitblit v1.9.1