Merge remote-tracking branch 'origin/div' into div

admin

2019-09-26 f38e508d334ae03024f0dce0d1fb6baed212dc24

 fanli/src/main/java/com/yeshi/fanli/log/LogHelper.java

@@ -10,8 +10,6 @@
import java.util.List;

import java.util.Map;



import javax.servlet.http.HttpServletRequest;



import org.apache.log4j.Logger;



import com.yeshi.fanli.util.TimeUtil;