From 555ff988376b8650455547d0b6ff7f12f4ae2c63 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期三, 26 三月 2025 17:27:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-common/src/main/java/com/sinata/common/utils/DateUtils.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/medicalWaste-common/src/main/java/com/sinata/common/utils/DateUtils.java b/medicalWaste-common/src/main/java/com/sinata/common/utils/DateUtils.java
index 4b09a69..92a68db 100644
--- a/medicalWaste-common/src/main/java/com/sinata/common/utils/DateUtils.java
+++ b/medicalWaste-common/src/main/java/com/sinata/common/utils/DateUtils.java
@@ -245,7 +245,7 @@
max.setTime(maxDate);
Calendar curr = min;
- max.add(Calendar.YEAR, 1);
+ //max.add(Calendar.YEAR, 1);
while (curr.before(max)) {
result.add(sdf.format(curr.getTime()));
curr.add(Calendar.YEAR, 1);
@@ -259,7 +259,7 @@
max.setTime(maxDate);
Calendar curr = min;
- max.add(Calendar.MONTH, 1);
+ //max.add(Calendar.MONTH, 1);
while (curr.before(max)) {
result.add(sdf.format(curr.getTime()));
curr.add(Calendar.MONTH, 1);
@@ -273,7 +273,7 @@
min.setTime(minDate);
max.setTime(maxDate);
Calendar curr = min;
- max.add(Calendar.DATE, 1);
+ //max.add(Calendar.DATE, 1);
while (curr.before(max)) {
result.add(sdf.format(curr.getTime()));
curr.add(Calendar.DATE, 1);
--
Gitblit v1.7.1