Merge branch 'V0.0.6-iot' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.6-iot

# Conflicts:
#	project_data/sql/0.0.6-iot/部署说明.txt

project_data/sql/0.0.6-iot/部署说明.txt

@@ -22,4 +22,12 @@
 
    ignore.whites: 节点下增加
     - /mediator/**
-	- /iot/VideoDiagnosis/img
+	- /iot/VideoDiagnosis/img
+ 2.application-dev.yml
+ # feign 配置 节点下 修改connectTimeout，readTimeout 时长为60000
+ feign:
+   client:
+     config:
+       default:
+         connectTimeout: 60000
+         readTimeout: 60000