Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

3 天以前 208ec6274f74c88ccf86c2fb3432a60cc7d21d59

 server/system_timer/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  profiles:
    active: self
    active: test
  application:
    name: systemTimer
    # 安全配置