Merge branch 'dev' of /Users/zjm/tykj/zb/device-back with conflicts.

dev-confirmcheck/src/main/java/com/tykj/dev/device/confirmcheck/controller/DeviceCheckController.java

@@ -688,9 +688,7 @@ public class DeviceCheckController {
                     //根据detail userC为省且任务状态是完结状态时 变为无误 否则是等待省审核
                     Integer detailId = task.getBillId();
                     Integer userCId = detailRepo.findById(detailId).get().getUserCId();
-
-                    if (task.getBillStatus().equals(END.id) && Objects.nonNull(userCId)  && userCId !=0 && userIsProv(userCId)){
-
+                    if (task.getBillStatus().equals(END.id) && Objects.nonNull(userCId) && userIsProv(userCId)){
                         checkResult = "无误";
                     }else {
                         checkResult = "等待省审核";