Merge branch 'master' of

http://60.205.210.36/proudkids-pub/kiss-config-server.git Conflicts: kiss-business-dev.yml

Merge branch 'master' of
http://60.205.210.36/proudkids-pub/kiss-config-server.git Conflicts: kiss-business-dev.yml
12275932 · 张宗强 · 8259a05b · 2fe64afd · 12275932
Commit 12275932 authored Aug 20, 2019 by 张宗强
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

kiss-business-dev.yml
+2 -0

No files found.
--- a/kiss-business-dev.yml
+++ b/kiss-business-dev.yml
@@ -64,5 +64,6 @@ wechat:
  menu:
  	name: "小象册"
  	url: "http://www.xiaoxiangce.proudkids.com"
 logging:
  config: classpath:logback.xml
\ No newline at end of file