Merge branch 'master' into xin

xin

2025-07-19 8841ef182bbe06a7ef1f102f51810502dde0a76f

 oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductMerchantController.java

@@ -124,6 +124,16 @@
        return ResponseEntity.noContent().build();
    }

    @PostMapping(value = "/delete")
    @Log("批量删除商品")
    @ApiOperation("批量删除商品")
    //@PreAuthorize("@el.check('merchant:product:batchDel') " +
    //        "and @storeMerchantOwnershipService.check(#storeId)")
    public ResponseEntity<?> delProduct(@ApiParam(value = "传ID数组[]") @RequestBody List<Long> ids) {
        productMerchantService.batchDelete(ids);
        return ResponseEntity.noContent().build();
    }

    @PutMapping(value = "/{productId}/on")
    @Log("上架商品")
    @ApiOperation("上架商品")