Merge branch 'dev' of shikejing/wlyy2.0 into dev

svr/svr-cloud-device/src/main/resources/application.yml

@@ -3,7 +3,7 @@ server:
  port: 9112
spring:
  application:
      name:  svr-cloud-device-skj
      name:  svr-cloud-device
  aop:
    proxy-target-class: true
  datasource: