gengxin

@@ -2,14 +2,9 @@
 
 namespace app\api\controller;
 
-<<<<<<< HEAD
-use app\admin\model\UserGift;
-=======
->>>>>>> a581f565d7001443e0e948aa4657b9a91c3e12fb
 use app\common\controller\Api;
 use app\common\model\Activity;
 use app\common\model\Card;
-use app\common\model\Order;
 use app\common\model\TradeOrder;
 use app\common\model\User;
 use app\common\model\UserCard;
@@ -170,8 +165,5 @@ class Active extends Api
         $response->send();
     }
 
-<<<<<<< HEAD
 
-=======
->>>>>>> a581f565d7001443e0e948aa4657b9a91c3e12fb
 }
\ No newline at end of file

@@ -48,11 +48,7 @@ class UserCard extends Model
             $data[] = db('activity')->where('id',$v)->find();
         }
         foreach ($data as $k => $v1){
-<<<<<<< HEAD
             $data[$k]['images'] = isset($v1['images']) && $v1['images'] ?  cdnurl($v1['images'],true) : '';
-=======
-            $data[$k]['images'] = cdnurl($v1['images'],true);
->>>>>>> a581f565d7001443e0e948aa4657b9a91c3e12fb
         }
         return $data;
     }