Merge branch 'tuancan' into test

b77f11d7 · suntengda · 984069b2 · e0523f7e · b77f11d7
Commit b77f11d7 authored Sep 02, 2021 by suntengda
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

Marketing.php application/modules/Marketing/controllers/Marketing.php +1 -0

No files found.
--- a/application/modules/Marketing/controllers/Marketing.php
+++ b/application/modules/Marketing/controllers/Marketing.php
@@ -237,6 +237,7 @@ class MarketingController extends Base
            $listPart = array_values($listPart);
        }
        unset($listPart);
+        $list['life_account_id'] = MarketingService::getPublicLifeAccountId();

        $this->success(['result' => $list]);
    }