Commit 24847322 authored by jianghaiming's avatar jianghaiming

Merge branch 'jielong' of https://gitlab.yidian-inc.com/bp/goods into jielong

parents 900809fa d0ec298b
...@@ -836,6 +836,7 @@ class MarketingService ...@@ -836,6 +836,7 @@ class MarketingService
$marketingData["max_price"] = $pindanMarketing["max_price"]; $marketingData["max_price"] = $pindanMarketing["max_price"];
$marketingData["min_price"] = $pindanMarketing["min_price"]; $marketingData["min_price"] = $pindanMarketing["min_price"];
$marketingData["participate_number"] = $pindanMarketing["participate_number"]; $marketingData["participate_number"] = $pindanMarketing["participate_number"];
$marketingData["create_time"] = $marketingInfo["create_time"];
$info['marketing_info'] = $marketingData; $info['marketing_info'] = $marketingData;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment