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

gongzuming

2024-09-11 a339c9b8617163ab705f64d59ef261fc7700f23f

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

@@ -47,4 +47,7 @@
    private String statusStr;

    private Integer realSales;//真实销量

    @ApiModelProperty(value = "价格排序")
    private Integer typeRank;
}