Merge branch 'dev-xpy' into dev

app/controller/api/Auth.php

@@ -472,7 +472,7 @@ class Auth extends BaseController
         $tokenInfo = $repository->createToken($user);
 
         $repository->loginAfter($user);
-        $useragree = Db::name('user_operating_record')->where('uid', $user['id'])->where('operation_type', 1)->where('module', 1)->find();
+        $useragree = Db::name('user_operating_record')->where('uid', $user['id'])->where('operation_model', 1)->where('operation_type', 1)->find();
         if (!$useragree){
             $repository->createUserOperatingRecord($user->uid, 1, 1, '用户同意用户协议记录');
         }
@@ -1625,7 +1625,7 @@ class Auth extends BaseController
         // $repository->bindSpread($user, intval($data['spread']));
         $tokenInfo = $repository->createToken($user);
         $repository->loginAfter($user);
-        $useragree = Db::name('user_operating_record')->where('uid', $user['id'])->where('operation_type', 1)->where('module', 1)->find();
+        $useragree = Db::name('user_operating_record')->where('uid', $user['id'])->where('operation_model', 1)->where('operation_type', 1)->find();
         if (!$useragree){
             $repository->createUserOperatingRecord($user->uid, 1, 1, '用户同意用户协议记录');
         }
@@ -1789,7 +1789,7 @@ class Auth extends BaseController
         }
         if(isset($result['code']) && $result['code'] == 200){
             $user = $repository->accountByUser($result['user']['account']);
-            $useragree = Db::name('user_operating_record')->where('uid', $user['id'])->where('operation_type', 1)->where('module', 1)->find();
+            $useragree = Db::name('user_operating_record')->where('uid', $user['id'])->where('operation_model', 1)->where('operation_type', 1)->find();
             if (!$useragree){
                 $repository->createUserOperatingRecord($user->uid, 1, 1, '用户同意用户协议记录');
             }