From d4c997972509c2da06b1128086b1735597823d3f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 30 Nov 2021 17:19:20 +0800
Subject: [PATCH] Merge branch 'ty_fix' of http://120.27.238.55:7000/r/beauty-erp into ty_fix
---
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