From e125b445697a6b8c2b5cc5c57f31249c5088c1c9 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 26 Jan 2018 14:44:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/application.yml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 01a9aae..b76fb92 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -36,6 +36,7 @@
     # ������������DruidDataSource���������������
     useGlobalDataSourceStat: true
 
+
   rabbitmq:
     host: 116.62.12.115
     port: 5672

--
Gitblit v1.8.0