Merge branch 'hotfix/retention_down' of wmtx/platform into master

修改bug

Application/Admin/Controller/ExportController.class.php

@@ -3884,6 +3884,10 @@ class ExportController extends Controller
             $error = '请选择游戏！';
             $status = false;
         }
+        if ($deviceType == '') {
+            $error = '请选择设备类型！';
+            $status = false;
+        }
         $startTime = strtotime($start . ' 00:00:00');
         $endTime = strtotime($end . ' 23:59:59') + 1;
         if ((($endTime - $startTime)/(24*3600)) > 31) {

Application/Admin/View/Stat/userretention.html

@@ -155,6 +155,7 @@
                 'end'    =>I('end',date('Y-m-d',time())),
                 'game_id'=>I('game_id'),
                 'promote_id'=>I('promote_id'),
+                'device_type'=>I('device_type'),
                 'xlsname'=>'数据分析_留存率分析',)
             ,false)}">导出</a>
         </if>