Merge remote-tracking branch 'origin/master'

zhangherong

9 天以前 8b746e482fea845bd6d044d609acc2763783d0bd

 src/main/resources/application.yml

@@ -2,5 +2,5 @@
  application:
    name: jeecg-system
  profiles:
    #    active: '@profile.name@'
    active: dev
    active: '@profile.name@'
#    active: dev