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

cloudroam

2024-12-30 b9903ead016b8b1aa68eb04b48fca3b53fdab0d3

 src/main/java/com/mzl/flower/dto/response/report/SupplierReportCalendarBO.java

@@ -3,16 +3,16 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.time.LocalDate;
import java.time.LocalDateTime;

@Data
public class SupplierReportCalendarBO {

    @ApiModelProperty("下单的开始时间")
    private LocalDate startDate;
    private LocalDateTime startDate;

    @ApiModelProperty("下单的结束时间")
    private LocalDate endDate;
    private LocalDateTime endDate;

    @ApiModelProperty(value = "供应商id")
    private Long supplierId;