修复时间显示bug
Merge branch 'cb/fix' into dev

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	res/layout/restaurant_detail_activity.xml