From 21dfd5f59bfe4b6245c50d14773f9060ee88fb89 Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Tue, 22 Jul 2025 20:40:06 +0800
Subject: [PATCH] 骑手订单新增手机号查询

---
 oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java
index 3e52c0a..d193a8e 100644
--- a/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java
+++ b/oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java
@@ -5,9 +5,8 @@
 import cn.hutool.core.lang.tree.TreeNodeConfig;
 import cn.hutool.core.lang.tree.TreeUtil;
 import cn.hutool.core.util.BooleanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.oying.annotation.Log;
-import com.oying.modules.pc.common.core.domain.R;
+import com.oying.utils.R;
 import com.oying.modules.pc.store.domain.StoreCategory;
 import com.oying.modules.pc.store.domain.dto.*;
 import com.oying.modules.pc.store.service.StoreCategoryService;
@@ -43,8 +42,8 @@
     @ApiOperation("查询店铺类目")
     //@PreAuthorize("@el.check('merchant:storeCategory:list')" +
     //        " and @storeMerchantOwnershipService.check(#storeId)")
-    public ResponseEntity<?> getList(@PathVariable Long storeId,
-                                     @RequestParam(value = "recursive", required = false) Boolean recursive) {
+    public ResponseEntity<?> getStoreCategories(@PathVariable Long storeId,
+                                                @RequestParam(value = "recursive", required = false) Boolean recursive) {
 
         StoreCategoryQueryCriteria criteria = new StoreCategoryQueryCriteria();
         criteria.setStoreId(storeId);
@@ -78,7 +77,7 @@
     @ApiOperation("查询店铺类目")
     //@PreAuthorize("@el.check('merchant:storeCategory:list')" +
     //        " and @storeMerchantOwnershipService.check(#storeId)")
-    public ResponseEntity<?> getById(@PathVariable Long categoryId,
+    public ResponseEntity<?> getStoreCategoryById(@PathVariable Long categoryId,
                                      @RequestParam(value = "recursive", required = false) Boolean recursive) {
 
         StoreCategory storeCategory = storeCategoryService.getById(categoryId);

--
Gitblit v1.9.3