Merge remote-tracking branch 'origin/master'

jiaosong

2023-08-14 3eca8e4741b06c6049fedccd5c0dea4e01b7aa5c

 server/src/main/java/doumeemes/dao/ext/WorkorderRecordExtMapper.java

@@ -2,6 +2,8 @@

import doumeemes.dao.business.model.WorkorderRecord;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import doumeemes.dao.ext.dto.QuerySalaryStatisticDTO;
import doumeemes.dao.ext.vo.SalaryStatisticsListVO;
import doumeemes.dao.ext.vo.WOutboundRecordExtListVO;
import doumeemes.dao.ext.vo.WStockExtListForWorkorderVO;
import doumeemes.dao.ext.vo.WorkorderRecordExtListVO;
@@ -18,6 +20,7 @@
     * @date 2022/04/20 10:56
     */
    List<WorkorderRecordExtListVO> selectListNew(QueryWorkorderRecordExtDTO dto);
    List<SalaryStatisticsListVO> salaryStatistic(QuerySalaryStatisticDTO dto);

    List<WStockExtListForWorkorderVO> choiceWorkorderRecordUseStockList(QueryWorkorderRecordExtDTO dto);