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

陶杰

2024-12-25 51eac60f5d04af43f93590ad2219f9bdda313745

 src/main/java/com/mzl/flower/dto/request/statisticAnalysis/FlowerSaleDTO.java

@@ -66,9 +66,14 @@
    @ApiModelProperty(value = "创建时间-结束；yyyy-MM-dd")
    private String createEndDateStr;

    @ApiModelProperty(hidden = true)

    private LocalDateTime createStartDate;

    @ApiModelProperty(hidden = true)

    private LocalDateTime createEndDate;

    @ApiModelProperty(value = "排序字段")
    private String orderField;
    @ApiModelProperty(value = "排序类型，ASC 升序，DESC 降序")
    private String orderType;
}