Merge branch 'dev' of http://192.168.1.220:10080/jiwei/jw2.0 into dev

Conflicts:
	app/app-iot-server/pom.xml

web-gateway/src/main/resources/application.yml

@@ -1,4 +1,6 @@
##如果有配置服务的话，远程服务器和本地服务器配置不一致的情况下，优先远程的为主
server:
  port: 8088
spring:
  application:
    name:  web-gateway  #注册到发现服务的id 如果id一样 eurika会自动做负载