From 6221c8b5df5eb0ee62dce79048c9c3f0dc3d0fc1 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期六, 31 八月 2024 20:15:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
index 238f2f6..f3b4c57 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
@@ -123,6 +123,7 @@
public Result importData(MultipartFile file,
Integer unitId,
String startTime,
+ Boolean needUpdateUnit,
String endTime) throws IOException, ParseException {
Date start = null;
Date end = null;
@@ -137,7 +138,7 @@
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
end = format.parse(endTime);
}
- return ywPointService.importData(file, unitId, start, end);
+ return ywPointService.importData(file, unitId, start, end, needUpdateUnit);
}
}
--
Gitblit v1.8.0