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

panlinlin

2021-01-13 ccc188c1135653685868199d3fecaf15b55938fd

 src/main/resources/application.yml

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