From b04753affc29f1042d0eb75b0af87824a0f4a8aa Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 09 八月 2024 15:41:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java | 5 +++--
1 files changed, 3 insertions(+), 2 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 0207ee6..6a663cb 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
@@ -10,6 +10,7 @@
import lombok.RequiredArgsConstructor;
import java.io.IOException;
+import java.util.Date;
import java.util.List;
import org.springframework.validation.annotation.Validated;
import jakarta.validation.constraints.NotEmpty;
@@ -115,8 +116,8 @@
@PostMapping("/import/{unitId}")
@ApiOperation(value = "瀵煎叆鏁版嵁", notes = "瀵煎叆鏁版嵁")
- public Result importData(MultipartFile file, @PathVariable("unitId") Integer unitId) throws IOException {
- return ywPointService.importData(file, unitId);
+ public Result importData(MultipartFile file, @PathVariable("unitId") Integer unitId, Date startTime, Date endTime) throws IOException {
+ return ywPointService.importData(file, unitId, startTime, endTime);
}
}
--
Gitblit v1.8.0