Merge remote-tracking branch 'origin/master'

feiyu02

昨天 e923f06d572c9a0e3b1eb2c54471af02c9d95bcf

 src/main/resources/log4j2.xml

@@ -57,7 +57,7 @@
   <!--root 默认加载-->
   <loggers>
      <root level="INFO">
<!--         <appender-ref ref="Console"/>-->
         <appender-ref ref="Console"/>
<!--         <appender-ref ref="allLog"/>-->
<!--         <appender-ref ref="debugLog"/>-->
         <appender-ref ref="errorLog"/>