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

gateway/ag-basic/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name: ag-basic-lyx
    name: ag-basic
  cloud:
    config:
      failFast: true