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

gongzuming

2024-09-02 0d864c9bf892fd7c56600e197072e07c57847b34

 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;

}