From e4efff6637f4d598a7efdfca8b62fbb4c3286b02 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期四, 22 五月 2025 15:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsShopController.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsShopController.java b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsShopController.java
index 48f08bf..29d3ec6 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsShopController.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/controller/basicData/ApsShopController.java
@@ -31,7 +31,7 @@
/**
* 鏌ヨ杞﹂棿鍒楄〃
*/
- @RequiresPermissions("shop:list")
+ // @RequiresPermissions("shop:list")
@GetMapping("/list")
public TableDataInfo list(ApsShop apsShop)
{
@@ -95,4 +95,15 @@
{
return toAjax(apsShopService.deleteApsShopByIds(ids));
}
+
+ /**
+ * 鏌ヨ杞﹂棿鍒楄〃
+ */
+// @RequiresPermissions("shop:list")
+ @GetMapping("/listAll")
+ public AjaxResult listAll(ApsShop apsShop)
+ {
+ List<ApsShop> list = apsShopService.selectApsShopList(apsShop);
+ return AjaxResult.success(list);
+ }
}
--
Gitblit v1.9.3