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

陶杰

2024-12-21 331c41ca7f21b81985ba23d60ec05c350d21daa8

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

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

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

@Data
@@ -24,4 +25,11 @@
    private Integer partnerFlag;


    @ApiModelProperty("订单的开始日期")
    private LocalDate paymentDateStart;

    @ApiModelProperty("订单的结束日期")
    private LocalDate paymentDateEnd;


}