完善签到流程
Merge remote-tracking branch 'origin/master'

Conflicts:
	Apps/Home/Model/goods_categoryModel.class.php