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

修改导出bug

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>