Merge branch 'master' into release

app/Repositories/BeanRepository.php

@@ -215,10 +215,10 @@ class BeanRepository
         $star_home['user']['username'] = $userInfo['username'];
         $star_home['user']['avatar'] = $userInfo['avatar'];
         //battle信息
-//        $activityInfo = $this->getActivity();
-//        $star_home['battle']['start'] = $activityInfo['start'];
-//        $star_home['battle']['end'] = $activityInfo['end'];
-//        $star_home['battle']['news'] = Redis::get('battle_latest_info_'.$activityInfo['id'])??'战场四平八稳，劳驾老板亲自去战场督战';
+        $activityInfo = $this->getActivity();
+        $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;
 
     }