From c357f8844e03627d0c3bea4bf2058e7c69ff3518 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期三, 14 五月 2025 14:18:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev_lhj
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsPlantController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsPlantController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsPlantController.java
index e3c2453..7728ec0 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsPlantController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsPlantController.java
@@ -31,13 +31,14 @@
/**
* 鏌ヨ宸ュ巶绠＄悊鍒楄〃
*/
- @RequiresPermissions("plant:list")
+ //@RequiresPermissions("plant:list")
@GetMapping("/list")
public TableDataInfo list(ApsPlant apsPlant)
{
- startPage();
- List<ApsPlant> list = apsPlantService.selectApsPlantList(apsPlant);
- return getDataTable(list);
+ //startPage();
+ //List<ApsPlant> list = apsPlantService.selectApsPlantList(apsPlant);
+ List<ApsPlant> list1 = apsPlantService.list();
+ return getDataTable(list1);
}
/**
--
Gitblit v1.9.3