Merge branch 'dev/cancelAnnotation' into develop

# Conflicts:
#	src/main/java/com/diagbot/process/BillProcess.java
#	src/main/java/com/diagbot/process/HighRiskProcess.java

src/main/resources/application-dev.yml

@@ -9,6 +9,7 @@ hystrix:
       maxQueueSize: 200 #BlockingQueue的最大队列数
       queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
   command:
+    CRFServiceClient#getAnnotation(CRFVo).execution.isolation.thread.timeoutInMilliseconds: 3000 #远程调用、CRF接口时间调整
     default:
       execution:
         timeout:

src/main/resources/application-local.yml

@@ -9,6 +9,7 @@ hystrix:
       maxQueueSize: 200 #BlockingQueue的最大队列数
       queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
   command:
+    CRFServiceClient#getAnnotation(CRFVo).execution.isolation.thread.timeoutInMilliseconds: 3000 #远程调用、CRF接口时间调整
     default:
       execution:
         timeout:

src/main/resources/application-pre.yml

@@ -9,6 +9,7 @@ hystrix:
       maxQueueSize: 200 #BlockingQueue的最大队列数
       queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
   command:
+    CRFServiceClient#getAnnotation(CRFVo).execution.isolation.thread.timeoutInMilliseconds: 3000 #远程调用、CRF接口时间调整
     default:
       execution:
         timeout:

src/main/resources/application-pro.yml

@@ -9,6 +9,7 @@ hystrix:
       maxQueueSize: 200 #BlockingQueue的最大队列数
       queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
   command:
+    CRFServiceClient#getAnnotation(CRFVo).execution.isolation.thread.timeoutInMilliseconds: 3000 #远程调用、CRF接口时间调整
     default:
       execution:
         timeout:

src/main/resources/application-test.yml

@@ -9,6 +9,7 @@ hystrix:
       maxQueueSize: 200 #BlockingQueue的最大队列数
       queueSizeRejectionThreshold: 50 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝
   command:
+    CRFServiceClient#getAnnotation(CRFVo).execution.isolation.thread.timeoutInMilliseconds: 3000 #远程调用、CRF接口时间调整
     default:
       execution:
         timeout: