Merge branch 'master' into master-v2

Cui Zhi Feng

2024-08-31 9c6e78ea55ef4c865b8148a5ca47322504ed1f50

 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;

}