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/ReportController.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java b/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java
index 4c754bf..bf5d5ef 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/ReportController.java
@@ -49,6 +49,12 @@
return reportService.importData(form);
}
+ @GetMapping("/getTogether/{pid}")
+ @ApiOperation(value = "鑾峰彇鍚屼竴鎵规鐨勬姤澶�", notes = "鑾峰彇鍚屼竴鎵规鐨勬姤澶�")
+ public Result getTogether(@PathVariable("pid") String pid) {
+ return reportService.getTogether(pid);
+ }
+
@PostMapping("/importTemplate")
@ApiOperation(value = "瀵煎叆妯℃澘", notes = "瀵煎叆妯℃澘")
@PreAuthorize("@ss.hasPermi('system:report:add')")
--
Gitblit v1.8.0