From c77b1732c23a6a53a81e693dc7630308661d13e8 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 10 二月 2025 13:47:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
index 6bc7ae8..ea54862 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
@@ -210,17 +210,13 @@
String url = wordUtil.generatePdf("/templates", "1_yzj_租赁合同.xml", templateParam, "租赁合同", "E:\\");
return R.ok(url);
}
- @ApiOperation(value = "导出")
- @PostMapping("/export")
- public void export(@RequestBody TContractQuery query){
- contractService.export(query);
- }
+
/**
* 光缆巡检列表导出
*/
- @ApiOperation(value = "光缆巡检列表导出")
- @Log(title = "现场作业-光缆巡检列表导出", businessType = BusinessType.EXPORT)
- @PostMapping("/exportOpticalInspection")
+ @ApiOperation(value = "导出")
+ @Log(title = "导出", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
public void exportOpticalInspection(@RequestBody TContractQuery query)
{
List<ContractExport> contractExports = new ArrayList<>();
--
Gitblit v1.7.1