Merge branch 'develop' of https://git.yidian-inc.com:8021/bp/goods into develop

application/services/marketing/MarketingGoodsService.php

@@ -145,7 +145,7 @@ class MarketingGoodsService
 
             $content = $userId .'_' .$value['marketing_id'];
             $goodsShareId = Aes::encrypt($content);
-            $list[$i]['distributor_code'] = $goodsShareId;
+            $list[$i]['goods_share_code'] = $goodsShareId;
 
             $i++;
         }