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

cloudroam

2024-12-26 6d2ec1b3b6979bce9c8f9244c8a17f5ccfa67063

 src/main/java/com/mzl/flower/dto/response/statisticAnalysis/FlowerSaleVO.java

@@ -32,6 +32,9 @@
    @ApiModelProperty(value = "品类")
    private String flowerCategory;

    @ApiModelProperty(value = "品类名称")
    private String flowerCategoryName;

    @ApiModelProperty(value = "商品名称")
    private String flowerName;