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

Cui Zhi Feng

2024-09-10 b27420f3e0cbb0de34c34ddd308dd4baf7d4b225

 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;
}