Merge branch 'dev' of ssh://139.186.142.91:29418/productDev/dmMes into dev

Mr.Shi

2023-09-11 24eb9d89423613c7322da715f2a445b4466ffcf4

 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);