Merge branch 'master' of http://59.57.98.130:3000/jjhc/report

 Conflicts:

	app/admin/controller/Talent.php

app/admin/controller/Talent.php

@@ -28,7 +28,7 @@ class Talent extends AdminController {
         $params = $request->param();
         $id = $params["id"];
         $info = VerifyApi::getTalentInfoById($id);
-        if ($info["checkState"] == 2 || $info["checkState"] == -1) {
+        if (in_array($info["checkState"], [-1, 2])) {
             return view("talentInfo_base_check", ["info" => $info]);
         } else {
             return view("talentInfo_common_check", ["info" => $info]);