Merge branch 'battle' into develop

app/Repositories/BeanRepository.php

@@ -212,6 +212,8 @@ class BeanRepository
         //battle信息
         $activityInfo = $this->getActivity();
         $star_home['battle']['img'] = 'https://uptoyo.oss-cn-zhangjiakou.aliyuncs.com/201908/1565169937_5d4a9911defca.jpg';
+        $star_home['battle']['start'] = $activityInfo['start'];
+        $star_home['battle']['end'] = $activityInfo['end'];
         $star_home['battle']['news'] = Redis::get('battle_latest_info_'.$activityInfo['id'])??'战场四平八稳，劳驾老板亲自去战场督战';
         return $star_home;