Merge branch 'master' into master-v2

Cui Zhi Feng

2024-08-30 852ec1d729b61077d8131591a5349c7e4a1bed79

 src/main/java/com/mzl/flower/web/customer/FlowerCustomerController.java

@@ -133,7 +133,7 @@

    @PostMapping("/cart/delete/batch")
    @ApiOperation(value = "批量删除购物车商品")
    public ResponseEntity<ReturnDataDTO<?>> deleteBatchFlower4Cart(CartDeleteDTO dto){
    public ResponseEntity<ReturnDataDTO<?>> deleteBatchFlower4Cart(@RequestBody CartDeleteDTO dto){
        if(dto == null || CollectionUtils.isEmpty(dto.getIds())){
            throw new ValidationException("ids不能为空");
        }