Merge remote-tracking branch 'origin/dev/20200603_1.3.1' into test

src/main/resources/mapper/QcresultInfoMapper.xml

@@ -334,6 +334,9 @@
         GROUP BY
         e.id,
         e.NAME,
+        <if test="filterPageVO.isReject == null">
+            d.is_reject,
+        </if>
         e.cases_id,
         e.cases_name
         ) t1,
@@ -809,6 +812,9 @@
         e.NAME,
         a.beh_dept_id,
         a.beh_dept_name,
+        <if test="filterPageByDeptVO.isReject == null">
+             d.is_reject,
+        </if>
         e.cases_id,
         e.cases_name
         ) t1,