Merge branches 'dev' and 'test' of http://git.estsh.com/i3-Andon/i3plus-andon into test

# Conflicts:
#	src/main/resources/application-dev.properties
数据库配置 show_sql -> false

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