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

panlinlin

2021-01-12 71aace5569d33f48336d8c50730264cafef0f673

 src/main/resources/application.yml

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