From 8841ef182bbe06a7ef1f102f51810502dde0a76f Mon Sep 17 00:00:00 2001 From: xin <1099200748@qq.com> Date: Sat, 19 Jul 2025 16:26:58 +0800 Subject: [PATCH] Merge branch 'master' into xin --- oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreCategoryMerchantController.java | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 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 d193a8e..6eefbd2 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 @@ -126,10 +126,20 @@ @DeleteMapping @Log("删除店铺类目") @ApiOperation("删除店铺类目") - @PreAuthorize("@el.check('storeCategory:del')" + - " and @storeMerchantOwnershipService.check(#storeId)") + /*@PreAuthorize("@el.check('storeCategory:del')" + + " and @storeMerchantOwnershipService.check(#storeId)")*/ public ResponseEntity<?> deleteStoreCategory(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) { storeCategoryService.deleteAll(ids); return ResponseEntity.noContent().build(); } + + @PostMapping(value = "/delete") + @Log("删除店铺类目") + @ApiOperation("删除店铺类目") + /*@PreAuthorize("@el.check('storeCategory:del')" + + " and @storeMerchantOwnershipService.check(#storeId)")*/ + public ResponseEntity<?> delStoreCategory(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) { + storeCategoryService.deleteAll(ids); + return ResponseEntity.noContent().build(); + } } -- Gitblit v1.9.3