Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0

panlinlin

2021-01-12 b6137471535fc88ba3b2a9e8beec9bb01850f4b3

 src/main/resources/application.yml

@@ -1,3 +1,3 @@
spring:
  profiles:
    active: local
    active: dev