From 2b72ee5736445aab3aa2b4ba6b862d7c660be9ce Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期二, 13 五月 2025 09:56:48 +0800
Subject: [PATCH] Merge branch 'dev_mp' into dev
---
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