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

gongzuming

2024-09-26 af77899d830e854d01b48bc12db04b02116e5ea4

 src/main/java/com/mzl/flower/service/calendar/CalendarService.java

@@ -1,7 +1,12 @@
package com.mzl.flower.service.calendar;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mzl.flower.dto.request.report.QueryOrderDTO;
import com.mzl.flower.dto.response.report.OrderReportCalendarBO;
import com.mzl.flower.entity.CalendarDO;
import com.baomidou.mybatisplus.extension.service.IService;

import java.util.List;

/**
 * <p>
@@ -14,4 +19,6 @@
public interface CalendarService extends IService<CalendarDO> {

    void generateCalendar(int i);

    List<OrderReportCalendarBO> getOrderDatePage(Page page, QueryOrderDTO dto);
}