fix:解决合并冲突

1 year ago · 6845d22efb
parent b1c92d0ac7
commit 6845d22efb
1 changed files with 1 additions and 1 deletions
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrTaskchildPictureMapper.xml
@ -646,7 +646,7 @@
                )
        </if>
        UNION
-        select tc.*, uf.COMMENTHIS, uf.TASKNAME as TASKNAMEHIS, uf.STATSHIS, uf.TASKNO, op.field6 as fromCustomerLevel, op.releaseArea as fromCity, op.is_repeat
+        select tc.*, uf.COMMENTHIS, uf.TASKNAME as TASKNAMEHIS, uf.STATSHIS, uf.TASKNO, op.field6 as fromCustomerLevel, op.releaseArea as fromCity, op.is_repeat,tc.is_repeated_nodules as isRepeatedNodules
        from ocr_taskchild_picture tc, OA_USERAPPROVE_T uf, ocr_picture op
        where tc.ID = uf.FORMID
          and tc.PICTUREID = op.ID