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

gongzuming

2024-09-09 ead65cd9b15cd574f4e37c3376c7447efea53935

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

@@ -51,6 +51,12 @@
    @ApiModelProperty(value = "最高价")
    private BigDecimal priceHigh;

    @ApiModelProperty(value = "最低价(会员)")
    private BigDecimal priceLowMember;

    @ApiModelProperty(value = "最高价(会员)")
    private BigDecimal priceHighMember;

    @ApiModelProperty(value = "库存")
    private Integer stock;