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

# 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

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