Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-14 3eca8e4741b06c6049fedccd5c0dea4e01b7aa5c

 server/src/main/java/doumeemes/service/ext/WorkorderRecordExtService.java

@@ -6,7 +6,9 @@
import doumeemes.dao.business.model.Workorder;
import doumeemes.dao.business.model.WorkorderRecord;
import doumeemes.dao.ext.bean.EndCheckApBean;
import doumeemes.dao.ext.dto.QuerySalaryStatisticDTO;
import doumeemes.dao.ext.dto.QueryWorkorderRecordExtDTO;
import doumeemes.dao.ext.vo.SalaryStatisticsListVO;
import doumeemes.dao.ext.vo.WorkorderRecordExtListVO;

import javax.servlet.http.HttpServletResponse;
@@ -45,4 +47,5 @@

   void exportExcel(PageWrap<QueryWorkorderRecordExtDTO> pageWrap ,HttpServletResponse response);

   PageData<SalaryStatisticsListVO> salaryStatistic(PageWrap<QuerySalaryStatisticDTO> pageWrap);
}