Merge remote-tracking branch 'origin/develop' into develop

application/api/model/User.php

@@ -481,10 +481,8 @@ class User extends Model
         $data = [];
 
         if($result){
-            //获取数组中的礼物ID集合
-//            $giftIds = array_column($result, 'gift_id');
-            $userInfo = [];
-            foreach ($result as &$item){
+            foreach ($result as $item){
+                $userInfo = [];
                 $users = explode(',', $item['give_user_ids']);
                 foreach ($users as $userId){
                     $user = db::name('user')->where(['id' => $userId])->field('id user_id,nickname,avatar')->find();
@@ -504,7 +502,6 @@ class User extends Model
             }
         }
 
-
         //查询所有的礼物
         $gift_list = db::name('vs_gift')
             ->field('gid as gift_id,gift_name,base_image,gift_price')