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

src/app/routes/usercenter/components/freight/list/list.component.ts

@@ -180,7 +180,7 @@ export class FreightComponentsListComponent implements OnInit {
       { title: '网络货运人', className: 'text-center', index: 'netTranName' },
       { title: '常用服务', className: 'text-center', index: 'oftenUsedServices', type: 'enum', enum: { 10: '整车发货', 20: '大宗发货' } },
       { title: '推广业务员', className: 'text-center', render: 'promotersTelephone' },
-      { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '用户注册', 2: '货主添加' } },
+      { title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '货主注册', 2: '平台添加' } },
       {
         title: '企业状态',
         className: 'text-center',

src/app/routes/usercenter/components/freight/user/user.component.ts

@@ -152,14 +152,13 @@ export class FreightComponentsUserComponent implements OnInit {
             placeholder: '请输入'
           }
         },
-        certificationStatus: {
+        stateLocked: {
           type: 'string',
           title: '状态',
           enum: [
             { label: '全部', value: '' },
-            { label: '待审核', value: 0 },
-            { label: '正常', value: 1 },
-            { label: '冻结', value: 2 }
+            { label: '正常', value: 0 },
+            { label: '冻结', value: 1 }
           ],
           default: '',
           ui: {