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

gongzuming

2024-09-11 a339c9b8617163ab705f64d59ef261fc7700f23f

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

@@ -67,4 +67,7 @@

    @ApiModelProperty(value = "重量")
    private Double weight;

    @ApiModelProperty(value = "售价")
    private BigDecimal sellPrice;
}