Merge branch 'hotfix/collect' into develop

app/controller/CustomerController.php

@@ -563,7 +563,7 @@ class CustomerController
         Log::info('receive collect start',$request->all());
         $user_sn = Util::getParam($request, 'user_sn'); //用户sn
 //        $user_email = Util::getParam($request, 'user_email'); //邮箱
-        $uid = Util::getParam($request, 'uid'); //邮箱
+        $user_id = Util::getParam($request, 'user_id'); //邮箱
         $sn = Util::getParam($request, 'order_no'); //客户sn验证客户唯一性
         $channel_id = Util::getParam($request, 'channel_id'); //渠道
         $country_id = Util::getParam($request, 'country_id'); //国家
@@ -592,7 +592,7 @@ class CustomerController
             ['sn' => $sn],
             [
                 'user_sn' => $user_sn,
-                'uid' => $uid,
+                'user_id' => $user_id,
                 'type' => 0,
                 'channel_id' => $channel_id,
                 'country_id' => $country_id,