Merge remote-tracking branch 'origin/pre-production'

2 weeks ago · c221d3ddeb
1 changed files with 1 additions and 1 deletions
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportIncomingMapper.xml
@ -409,7 +409,7 @@
        MONTH(lww.document_making_time)
    </select>

-    <select id="deptIncomingExportNew" resultType="com.logpm.report.vo.ReportDeptIncomingVO">
+    <select id="deptIncomingExportNew" resultType="com.logpm.report.vo.ReportDeptIncomingExportVO">
        select
        <if test="param.businessLines != null and param.businessLines.size() > 0 ">
            waw.business_line businessLine,