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

gongzuming

2024-09-20 875de0f786639bc089ff54aeb9a2fcabdf5f832b

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

@@ -26,4 +26,10 @@
    private Long paramId;

    private Integer realSales;//真实销量

    @ApiModelProperty(value = "会员价")
    private BigDecimal priceMember;

    @ApiModelProperty(value = "会员价总价")
    private BigDecimal totalMember;
}