From 4fab586f605fcd99850c2e1575089f80e00846f1 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 18 四月 2025 17:33:33 +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 |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 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..e7f7f87 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
@@ -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