From 659d3e60c6fe5e5bcd8c4cbb3dd8077e29f13a38 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 13 May 2024 18:54:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/util/MyDateUtils.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/util/MyDateUtils.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/util/MyDateUtils.java
index 2907625..801fa47 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/util/MyDateUtils.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/util/MyDateUtils.java
@@ -24,8 +24,8 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
try {
- Date startDate = sdf.parse(StringUtil.format("{}-05-01",nowYear));
- Date endDate = sdf.parse(StringUtil.format("{}-11-01",nowYear));
+ Date startDate = sdf.parse(StringUtil.format("{}-04-15",nowYear));
+ Date endDate = sdf.parse(StringUtil.format("{}-10-15",nowYear));
inSeason = today.after(startDate)&&today.before(endDate);
return inSeason;
--
Gitblit v1.9.3