mapreduce增加判断时间不为空-by jarrick
Merge remote-tracking branch 'origin/master'

Conflicts:
	routes/report.js
Merge remote-tracking branch 'origin/master'