From 44f2a0a32c096bdb05d4cc0ac162cdc1eb14c3ed Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 10 八月 2023 13:14:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarmpoints/tube/controller/ArdTubesDetailsController.java | 6 +++---
1 files changed, 3 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..2d2f9c3 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);
}
/**
--
Gitblit v1.9.3