From eb77373d92f01e51b98bda8fae66315ed9a4394d Mon Sep 17 00:00:00 2001
From: 彭雪彬 <1724387007@qq.com>
Date: Mon, 14 Jul 2025 17:08:57 +0800
Subject: [PATCH] 骑手接单和骑手取消订单

---
 oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 f576684..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
@@ -42,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);
@@ -77,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