From 1bca1b9c61676b48cc3137d3003e520c75ecdd92 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 13 一月 2024 10:57:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarmpoints/tube/controller/ArdTubesDetailsController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/controller/ArdTubesDetailsController.java b/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/controller/ArdTubesDetailsController.java
index c44e3b9..d979117 100644
--- a/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/controller/ArdTubesDetailsController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarmpoints/tube/controller/ArdTubesDetailsController.java
@@ -45,11 +45,11 @@
@PreAuthorize("@ss.hasPermi('alarmpoints:tubesDetails:list')")
@GetMapping("/list")
@ApiOperation("鏌ヨ绠＄嚎璇︽儏鍒楄〃")
- public TableDataInfo list(ArdTubesDetails ardTubesDetails)
+ public AjaxResult list(ArdTubesDetails ardTubesDetails)
{
- startPage();
+ //startPage();
List<ArdTubesDetails> list = ardTubesDetailsService.selectArdTubesDetailsList(ardTubesDetails);
- return getDataTable(list);
+ return AjaxResult.success(list);
}
/**
@@ -120,6 +120,7 @@
String message = ardTubesDetailsService.importArdTubesDetails(tubesDetailsList, updateSupport, operName,tubeId);
return success(message);
}
+
@PostMapping("/importTemplate")
@ApiOperation(value = "绠＄嚎璇︽儏妯℃澘涓嬭浇鎺ュ彛")
public void importTemplate(HttpServletResponse response)
--
Gitblit v1.9.3