Merge remote-tracking branch 'origin/master-v4' into master-v4

陶杰

2024-12-25 6f0cee21409ccd21a762fb3a3a46cec06f65b503

 src/main/java/com/mzl/flower/dto/response/flower/FlowerCartListWrapDTO.java

@@ -14,7 +14,7 @@
    @ApiModelProperty(value = "供应商名称")
    private String supplierName;

    @ApiModelProperty(value = "供应商名称")
    @ApiModelProperty(value = "商品列表")
    private List<FlowerCartListDTO> flowerList;

}