Merge branch 'pre_release' into 'master'

活动详情增加生活号管理员信息

See merge request bp/goods!66

application/services/marketing/MarketingService.php

@@ -1081,8 +1081,10 @@ class MarketingService
 
         $marketingData["life_account_name"] = $marketingData["life_account_icon"] = "";
         if (!empty($lifeAccountList[$pindanMarketing["publish_life_account_id"]])) {
+            $marketingData["life_account_admin_id"] = strval($lifeAccountList[$pindanMarketing["publish_life_account_id"]]["life_account_admin_id"]);//客户端需要字符串格式
             $marketingData["life_account_name"] = $lifeAccountList[$pindanMarketing["publish_life_account_id"]]["life_account_name"];
             $marketingData["life_account_icon"] = $lifeAccountList[$pindanMarketing["publish_life_account_id"]]["life_account_icon"];
+            $marketingData["life_account_register_days"] = self::countAccountRegisterDays($lifeAccountList[$pindanMarketing["publish_life_account_id"]]['create_time']);
         }
         $marketingData["id"] = $marketingInfo["marketing_id"];
         $marketingData["marketing_name"] = $marketingInfo["marketing_name"];