edit

lib/Base.php

@@ -195,7 +195,6 @@ class Base
     # 合并用户
     public function combine($uid, $unionid, $col = 'unionid')
     {
-        return $uid;
     	$cur = $uid;
         if ($col == 'mobile' || $col == 'id') {
             $user_wechat = Dever::load('passport/user-all', array($col => $unionid));