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

cloudroam

2024-10-12 d390d8f502436eaa17ee8ca7abd3c3f8a11a8514

 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;

}