Merge remote-tracking branch 'origin/master'

cuilei

16 小时以前 76c5ad320495758d4e76d852d96914f1b405ece7

1
2
3
4
5
6
spring:
  application:
    name: jeecg-system
  profiles:
    active: '@profile.name@'
#    active: dev