Merge branch 'master-fix-0914' into dev

# Conflicts:
#	app/common/model/ShopContract.php

app/adminapi/controller/CompanyController.php

@@ -371,6 +371,7 @@ class CompanyController extends BaseAdminController
             if (empty($params['master_name'])) {
                 throw new Exception('商户法人名称不能为空');
             }
+
             $data = [
                 'mer_intention_id' => $params['mer_intention_id'], // 商城商户入驻申请id，签约完成后回调使用
                 'company_name' => $params['company_name'],
@@ -381,7 +382,8 @@ class CompanyController extends BaseAdminController
                 'master_name' => $params['master_name'],
                 'master_phone' => $params['master_phone'],
                 'master_email' => substr(md5(uniqid()),rand(0, 22),10)."@lihai.com",
-                'face_create_status' => 1
+                'face_create_status' => 1,
+                'qualification' => $params['images']
             ];
 
             $shopMerchantModel = ShopMerchant::create($data);

app/common/model/ShopContract.php

@@ -16,7 +16,7 @@ namespace app\common\model;
 
 
 use app\common\model\BaseModel;
-
+use app\common\model\dict\DictData;
 
 
 /**
@@ -30,6 +30,7 @@ class ShopContract extends BaseModel
     protected $name = 'shop_contract';
 
 
+
     /**
      * @notes 关联company_name
      * @return \think\model\relation\HasOne