Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master

wujianwei

6 天以前 89fd2cf7202c321512c2ea699a3a220a7138ed44

 ui/admin-ui3/src/views/tms/tmsConsignor/index.vue

@@ -148,7 +148,7 @@
              message: "所属客户不能为空", trigger: "change"
            }
          ],
          type: 'table',
          type: 'table',dataType: 'string',
          children:{
            border: true,
            searchMenuSpan: 5,