Merge remote-tracking branch 'origin/master'

# Conflicts:
#	app/Admin/Controllers/Recruit/RecruitController.php

public/themes/default/views/app/recruit/show.blade.php

@@ -77,7 +77,7 @@
                         <li style="background:#19b38d;float: left;margin-bottom:10px;">上机/考核准考证打印</li>
                     </a>
                 @endif
-                @if(in_array(5,explode(',',$recruit->step)))
+                @if(in_array(5,explode(',',$recruit->step)) && $recruit->face_ticket_type == 1)
                     <a href="javascript:void(0)" id="face_ticket" data-id="{{$info->id}}" >
                         <li style="background:#bc3fbb;float: left;margin-bottom:10px;">面试通知书打印</li>
                     </a>