Merge remote-tracking branch 'origin/master'

zhs

6 天以前 76fb5d8b5249d74a77ca3e44ca9cf98b57b31ace

 smartor/src/main/java/com/smartor/service/impl/PatMedOperationServiceImpl.java

@@ -226,8 +226,7 @@
            String remark = patArchive.getNotrequiredreason();
            serviceSubtask.setRemark(remark);
            serviceSubtask.setResult("error");
            serviceSubtask.setFinishtime(new Date());
            log.error("serviceSubtask888888的值为：{}",serviceSubtask);
//            serviceSubtask.setFinishtime(new Date());
            //不执行
            serviceSubtask.setSendstate(4L);
        }