添加log4j配置文件
Merge remote-tracking branch 'origin/master'