From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +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 238f2f6..5293a90 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
@@ -101,7 +101,7 @@
@GetMapping("/list")
@ApiOperation(value = "鍒楄〃", notes = "鍒楄〃")
- @PreAuthorize("@ss.hasPermi('point:list')")
+// @PreAuthorize("@ss.hasPermi('point:list')")
public Result list() {
return ywPointService.all();
}
@@ -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