Merge branch 'master' into xin

xin

2025-07-19 8841ef182bbe06a7ef1f102f51810502dde0a76f

 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();
    }
}