Merge remote-tracking branch 'origin/master'

business-common/src/main/resources/mybatis/business/ZhcxCommissionCheckDao.xml

@@ -73,7 +73,7 @@
                 JOIN INCONTROL.ZHCX_PROJECT_DEVICE_NUMBER nu ON
                 c.MACHINEID = nu.ID
                     AND nu.DELETED = '0'
-                    AND (nu.STATUS != '发运' OR nu.STATUS IS NULL OR nu.STATUS != '已交机')
+                    AND ((nu.STATUS != '发运' and nu.STATUS != '已交机') OR nu.STATUS IS NULL)
         WHERE
             c.PROJECTCODE = (
                 SELECT