Merge remote-tracking branch 'refs/remotes/git1207.com/mdj' into mdj
综合查询时间格式修改，
Merge remote-tracking branch 'refs/remotes/loou/mdj' into mdj