Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/shared/services/business/shipper-base.service.ts

@@ -14,7 +14,7 @@ export class ShipperBaseService extends BaseService {
   $api_get_staff_list = `/api/mdc/cuc/userApp/getStaffList`; //查询企业项目员工列表(录单员)
   $api_get_network_freight_forwarder_list = `/api/mdc/cuc/networkTransporter/findAll`; // 获取网络货运人
   $api_get_settlement_customer_list = `/api/mdc/cuc/settlementCustomer/findAll`; // 查找所有结算客户信息(下拉)
-  $api_get_crm_customer_list = `/api/mdc/cuc/crmCustomer/findAll`; // 查找所有Crm客户信息(下拉)
+  $api_get_crm_customer_list = `/api/mdc/cuc/enterprise/getCrmSelectList`; // 查找所有Crm客户信息(下拉)
   $api_get_network_freight_forwarder_one = `/api/mdc/cuc/networkTransporter/get`; // 获取网络货运人
   $api_get_roles = `/api/mdc/cuc/roleInfo/getRoleList`; // 获取角色列表
   // 根据FullKey获取系统子配置(树)
@@ -153,8 +153,8 @@ export class ShipperBaseService extends BaseService {
         }
         const list = res.map((item: any) => {
           return {
-            label: item.customerName,
-            value: item.id
+            label: item.enterpriseName,
+            value: item.enterpriseId
           };
         });
         const obj = [];