Merge branch 'tuancan' into test

application/services/marketing/MarketingService.php

@@ -1094,6 +1094,7 @@ class MarketingService
 
         $marketingData["life_account_name"] = $marketingData["life_account_icon"] = "";
         if (!empty($lifeAccountList[$pindanMarketing["publish_life_account_id"]])) {
+            $marketingData["life_account_admin_id"] = $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']);