Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-23 ba2a88b235360c8bea43f1c3adc90df84f437576

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