合并

app/controller/api/user/User.php

@@ -735,15 +735,9 @@ class User extends BaseController
             if ($res) {
                 //赠送积分 完善实名送20个积分，同时送邀请人20个积
                 $this->sign_add($member_id, 20,1,'完善实名系统赠送20个积分','','');
-<<<<<<< HEAD
-                $member_info = Db::name('user')->where( array('uid' => $member_id) )->find(); 
-                if($member_info['spread_uid']){
-                     //首次邀请好友奖励积分
-=======
                 $member_info = Db::name('user')->where( array('uid' => $member_id) )->find();
                 if($member_info['spread_uid']){
                     //首次邀请好友奖励积分
->>>>>>> 5a864c5d52463e1d71d2e80b95a91a2d09015473
                     $spreadUid = $member_info['spread_uid'];
                     $this->sign_add($spreadUid, 20,1,'好友完善实名系统赠送20个积分','','');
                 }
@@ -758,11 +752,7 @@ class User extends BaseController
     }
 
 
-<<<<<<< HEAD
-        /**
-=======
     /**
->>>>>>> 5a864c5d52463e1d71d2e80b95a91a2d09015473
      * @param int $uid 用户ID
      * @param string $score 积分
      * @param int $status 积分状态