Merge branch 'master' of http://192.168.2.236:10080/louhr/qc

Conflicts:
	kernel/src/main/java/com/lantone/qc/kernel/client/hystrix/CRFServiceHystrix.java

kernel/src/main/java/com/lantone/qc/kernel/client/hystrix/CRFServiceHystrix.java

@@ -13,7 +13,7 @@ public class CRFServiceHystrix implements CRFServiceClient{
 
     @Override
     public String getAnnotation(CRFVo crfVo) {
-//        System.out.printf(crfVo.getData());
+
         return null;
     }
 }

kernel/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 server:
-  port: 5009 # 端口号
+  port: 5008 # 端口号
   servlet:
     context-path: ${spring.application.name}  # 访问路径，如果不配置，访问IP:端口号，配置后访问IP:端口号/${context-path}