From 48311c063cc8ac7676c7bb57f8ab67cd49481d52 Mon Sep 17 00:00:00 2001
From: "wei.peng" <123456>
Date: Tue, 2 Jul 2019 23:13:31 +0800
Subject: [PATCH] Merge branches 'dev' and 'test' of
 http://git.estsh.com/i3-Andon/i3plus-andon into test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Conflicts:
#	src/main/resources/application-dev.properties
数据库配置 show_sql -> false
---
 .../src/main/resources/application-docker.properties                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties b/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties
index 8dbb251..6479ba9 100644
--- a/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties
+++ b/modules/i3plus-core-apiservice/src/main/resources/application-docker.properties
@@ -81,7 +81,7 @@ spring.data.mongodb.port=27017
 spring.jpa.database=MYSQL
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect
 #是否显示sql
-spring.jpa.show-sql=true
+spring.jpa.show-sql=false
 #表关系create,create-drop,update,validate
 spring.jpa.properties.hibernate.hbm2ddl.auto=update