Merge remote-tracking branch 'origin/xin' into pxb

彭雪彬

2025-07-14 c1d20b425b10e8ba59f102dd1ab413055883eed0

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