Merge branch 'feature/gift_list_change' into dev

Application/Sdk/Controller/GameGiftPageController.class.php

@@ -32,13 +32,15 @@ class GameGiftPageController extends Controller{
         switch ($sdkVersion) {
             case 1:
             case 2:
-                $map['giftbag_version'] = $sdkVersion;
+                $map['giftbag_version'] = ['in', [$sdkVersion, 4]];
                 break;
         }
+
     	$list = $gift
     			->field("id,giftbag_name,novice,start_time,end_time,desribe,game_name")
     			->where($map)
     			->select();
+
     	//遍历数据获取游戏图片地址
    		foreach ($list as $key => $val) {
             $res = M('gift_record','tab_')->field('id')->where(['gift_id' => $val['id'],'user_id' => $this->userId])->find();