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

panlinlin

2021-03-01 418970eab27d313307d60fd4f2a187efcea260ff

 src/main/resources/application.yml

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