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

Conflicts:
	svr/svr-iot/src/main/resources/application.yml

svr/svr-iot/src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
spring:
  application:
    name:  svr-iot  #注册到发现服务的id 如果id一样 eurika会自动做负载
    name:  svr-iot-ysj  #注册到发现服务的id 如果id一样 eurika会自动做负载
  datasource:
    driver-class-name: com.mysql.jdbc.Driver

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

@@ -3,7 +3,7 @@ server:
  port: 8088
spring:
  application:
    name:  web-gateway  #注册到发现服务的id 如果id一样 eurika会自动做负载
    name:  web-gateway-ysj  #注册到发现服务的id 如果id一样 eurika会自动做负载
  http:
    multipart:
      enabled: true