Merge branch 'master' into pindan_temp

application/services/marketing/MarketingService.php

@@ -572,7 +572,7 @@ class MarketingService
         $marketing = Marketing::getRecord(["marketing_name" => $marketingName], ["marketing_id"]);
         if (!empty($marketing)) {
             $marketingPindan = MarketingPindan::getRecord(["marketing_id" => $marketing["marketing_id"]]);
-            if (!empty($marketingPindan) && $publicLifeAccountId == $marketingPindan["publish_life_account_id"]) {
+            if (!empty($marketingPindan) && $lifeAccountId == $marketingPindan["publish_life_account_id"]) {
                 throw new MarketingException(['cus' => 18]);
             }
         }