From c8186945347d0d5925eda5f1e032c91bcbb18bb4 Mon Sep 17 00:00:00 2001
From: zhanghl <zhanghl1986@outlook.com>
Date: 星期六, 24 五月 2025 17:09:03 +0800
Subject: [PATCH] 将本地log 从git 排除
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsPlantController.java | 20 ++++++++++++++++----
1 files changed, 16 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 736f1b5..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);
}
/**
@@ -95,4 +96,15 @@
{
return toAjax(apsPlantService.deleteApsPlantByIds(ids));
}
+
+ /**
+ * 鏌ヨ宸ュ巶绠＄悊鍒楄〃
+ */
+// @RequiresPermissions("plant:list")
+ @GetMapping("/listAll")
+ public AjaxResult listAll(ApsPlant apsPlant)
+ {
+ List<ApsPlant> list = apsPlantService.selectApsPlantList(apsPlant);
+ return AjaxResult.success(list);
+ }
}
--
Gitblit v1.9.3