冲突

Mr.Zhang

2023-09-01 25cc716bd7c5968aa11d6c9aaef6e0cd724b86ad

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

@@ -49,6 +49,9 @@

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


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

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

    PageData<UserSalaryListVO> userSalaryPage(PageWrap<QueryUserSalaryListDTO> pageWrap);