From df2fb2c7c4c9c6db3689fa00bb76a859d9e913ce Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Wed, 8 May 2019 21:08:45 +0800 Subject: [PATCH] Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-block into test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # modules/i3plus-block-form/src/main/resources/application-test.properties # modules/i3plus-block-report/src/main/resources/application-test.properties 合并代码 发版修改配置 - Pw 2019-5-8 20:53:28 --- .../src/main/resources/application-test.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties index fdd2276..c8df180 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application-test.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application-test.properties @@ -106,7 +106,6 @@ impp.schedule.thread-count=10 impp.schedule.thread-priority=5 - ################################ 其他功能设置 ################################ #redisIP redis.hostName=192.168.1.240