From bd375f4fe8081c0ca612d72ed06c47ab3f89d68d Mon Sep 17 00:00:00 2001
From: xin <1099200748@qq.com>
Date: Wed, 02 Jul 2025 16:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pxb'
---
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