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

application/models/marketing/mysql/ColonelDistributorColonel.php

@@ -17,7 +17,7 @@ class ColonelDistributorColonel extends MysqlBase
     const COLONEL_SOURCE_APPLY = 1; //用户申请
     const COLONEL_SOURCE_ADMIN = 2; //运营添加
 
-    const DEFAULT_COLUMN = ['colonel_id','user_id','take_place_id','phone','contact_name','colonel_distributor_code','colonel_source'];
+    const DEFAULT_COLUMN = ['colonel_id','user_id','take_place_id','phone','contact_name','colonel_source'];
 
 
     public static function getRecord(array $where, $column = '*')

application/services/marketing/ColonelService.php

@@ -248,7 +248,6 @@ class ColonelService
             'life_account_id' => $applyInfo['life_account_id'],
             'phone' => $applyInfo['phone'],
             'contact_name' => $applyInfo['contact_name'],
-            'colonel_distributor_code' => '', //TODO 生成活动码
             'colonel_source' => ColonelDistributorColonel::COLONEL_SOURCE_APPLY
         ];
         return ColonelDistributorColonel::insertRecord($colonelData);