Merge branch 'feature/group_type' into dev

Application/Admin/Controller/PublicController.class.php

@@ -107,7 +107,7 @@ class PublicController extends \Think\Controller
                 }
                 $uid = $promote['id'];
             } else {
-                $partner = M('partner', 'tab_')->where(['link_man' => $mobile,])->find();
+                $partner = M('partner', 'tab_')->where(['link_phone' => $mobile,])->find();
                 if ($partner) {
                     /* 记录登录SESSION和COOKIES */
                     $cp_auth = array(
@@ -131,7 +131,7 @@ class PublicController extends \Think\Controller
                         session($session_name.'_sign', data_auth_sign($cp_auth));
                     }
 
-                    $uid = $promote['id'];
+                    $uid = $partner['id'];
                 }
             }