From b8264e5f4810bdbaed7e83d703f42f09a46c75da Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 2 Jun 2024 17:59:42 +0800
Subject: [PATCH] md

---
 src/views/emis/emisBrand/index.vue                        | 8 ++++----
 src/views/emis/emisCountry/index.vue                      | 8 ++++----
 src/views/emis/emisCustomerAddress/recipientAddress.vue   | 8 ++++----
 src/views/emis/emisCustomerAddress/senderAddress.vue      | 8 ++++----
 src/views/emis/emisCustomerUser/moneyUserList.vue         | 8 ++++----
 src/views/emis/emisCustomerUser/monthUserList.vue         | 8 ++++----
 src/views/emis/emisDestination/index.vue                  | 8 ++++----
 src/views/emis/emisElectronicPag/index.vue                | 8 ++++----
 src/views/emis/emisGoods/emisGoodsForm.vue                | 4 ++--
 src/views/emis/emisGoods/index.vue                        | 8 ++++----
 src/views/emis/emisMaterial/index.vue                     | 8 ++++----
 src/views/emis/emisMonthpayAccount/index.vue              | 8 ++++----
 src/views/emis/emisMonthpayUseApply/index.vue             | 8 ++++----
 src/views/emis/emisNotCalcAging/index.vue                 | 8 ++++----
 src/views/emis/emisPrintTpl/index.vue                     | 8 ++++----
 src/views/emis/emisProblemType/index.vue                  | 8 ++++----
 src/views/emis/emisQuotePrice/specialQuotePriceList.vue   | 8 ++++----
 src/views/emis/emisQuotePrice/transQuotePriceList.vue     | 8 ++++----
 .../emis/emisQuotePrice/vipSpecialQuotePriceList.vue      | 8 ++++----
 src/views/emis/emisQuotePrice/vipTransQuotePriceList.vue  | 8 ++++----
 src/views/emis/emisRegion/PcdPanel.vue                    | 8 ++++----
 src/views/emis/emisSite/index.vue                         | 8 ++++----
 src/views/emis/emisSiteAccount/index.vue                  | 8 ++++----
 src/views/emis/emisSpecialCalcWeight/index.vue            | 8 ++++----
 src/views/emis/emisTmsScanRecord/scanRecordQuery.vue      | 4 ++--
 src/views/emis/emisTransLine/index.vue                    | 8 ++++----
 src/views/emis/emisTransProduct/index.vue                 | 8 ++++----
 src/views/emis/emisUser/index.vue                         | 8 ++++----
 src/views/emis/emisWarehouseIn/index.vue                  | 8 ++++----
 src/views/emis/emisWarehouseInBatch/index.vue             | 8 ++++----
 src/views/emis/emisWaybill/A4WaybillIPrinted.vue          | 8 ++++----
 src/views/emis/emisWaybill/centerWaybillList.vue          | 8 ++++----
 src/views/emis/emisWaybill/dispatchWaybillList.vue        | 8 ++++----
 .../emisWaybill/orderEntryAndReceiptPictureManagement.vue | 6 +++---
 src/views/emis/emisWaybill/orderList.vue                  | 8 ++++----
 src/views/emis/emisWaybill/sendWaybillList.vue            | 8 ++++----
 .../uploadThePictureOfTheSendWaybillShipment.vue          | 4 ++--
 .../emisWaybill/uploadThePictureOfTheWaybillSigning.vue   | 4 ++--
 src/views/emis/emisWaybill/waybillIsPrinted.vue           | 8 ++++----
 src/views/emis/emisWaybill/waybillList.vue                | 8 ++++----
 src/views/emis/emisWaybillProblemInfo/index.vue           | 8 ++++----
 src/views/emis/emisWaybillProblemInfo/problemEntry.vue    | 4 ++--
 src/views/system/domain/index.vue                         | 6 +++---
 src/views/system/notice/index.vue                         | 2 +-
 src/views/system/sysAccount/index.vue                     | 4 ++--
 src/views/system/sysAccountLog/index.vue                  | 4 ++--
 src/views/system/sysAppinfo/index.vue                     | 6 +++---
 src/views/system/sysCostTime/index.vue                    | 8 ++++----
 src/views/system/sysDynamicSql/index.vue                  | 4 ++--
 src/views/system/sysI18n/index.vue                        | 6 +++---
 src/views/system/sysIpBlack/index.vue                     | 8 ++++----
 src/views/system/sysMerchant/index.vue                    | 6 +++---
 src/views/system/sysMerchantService/index.vue             | 2 +-
 src/views/system/sysTenantBizApp/index.vue                | 4 ++--
 src/views/system/sysZoneNav/index.vue                     | 6 +++---
 src/views/system/sysZoneNav/navEditor.vue                 | 6 +++---
 src/views/system/tenant/index.vue                         | 6 +++---
 src/views/wms/wmsWarehouse/index.vue                      | 4 ++--
 58 files changed, 198 insertions(+), 198 deletions(-)

diff --git a/src/views/emis/emisBrand/index.vue b/src/views/emis/emisBrand/index.vue
index 21d6e479..bd64b75e 100644
--- a/src/views/emis/emisBrand/index.vue
+++ b/src/views/emis/emisBrand/index.vue
@@ -129,11 +129,11 @@
           </template>
         </el-table-column>
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
diff --git a/src/views/emis/emisCountry/index.vue b/src/views/emis/emisCountry/index.vue
index bedbba5d..a02fc26e 100644
--- a/src/views/emis/emisCountry/index.vue
+++ b/src/views/emis/emisCountry/index.vue
@@ -177,11 +177,11 @@
             <el-table-column label="排序" align="center" prop="orderNum" width="100" :sort-orders="['descending','ascending']" sortable="custom" />
             <!-- <el-table-column label="创建时间" align="center" prop="createTime" min-width="160" :sort-orders="['descending','ascending']" sortable="custom" /> -->
             <el-table-column label="备注" align="center" prop="remark"  width="80"/>
-            <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-            <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+            <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+            <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
             <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-            <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-            <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+            <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+            <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
             <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/emis/emisCustomerAddress/recipientAddress.vue b/src/views/emis/emisCustomerAddress/recipientAddress.vue
index 3cc3f49a..8718f306 100644
--- a/src/views/emis/emisCustomerAddress/recipientAddress.vue
+++ b/src/views/emis/emisCustomerAddress/recipientAddress.vue
@@ -138,11 +138,11 @@
             <!-- <el-table-column :label="$t('使用站点代码')" align="center" prop="useSiteCode" min-width="100" /> -->
             <!-- <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" /> -->
             <!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
-            <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-            <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+            <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+            <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
             <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-            <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-            <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+            <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+            <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
             <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
             <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/emis/emisCustomerAddress/senderAddress.vue b/src/views/emis/emisCustomerAddress/senderAddress.vue
index 4cfd3d0a..b198ad07 100644
--- a/src/views/emis/emisCustomerAddress/senderAddress.vue
+++ b/src/views/emis/emisCustomerAddress/senderAddress.vue
@@ -136,11 +136,11 @@
       <!-- <el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" /> -->
       <!-- <el-table-column :label="$t('使用站点是否默认')" align="center" prop="blSiteDefaultFlag" min-width="100" /> -->
       <el-table-column :label="$t('所属站点')" align="center" prop="useSite" min-width="100" />
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/emis/emisCustomerUser/moneyUserList.vue b/src/views/emis/emisCustomerUser/moneyUserList.vue
index 5b5ed258..ec2c393e 100644
--- a/src/views/emis/emisCustomerUser/moneyUserList.vue
+++ b/src/views/emis/emisCustomerUser/moneyUserList.vue
@@ -178,11 +178,11 @@
       <el-table-column :label="$t('最近下单时间')" align="center" prop="lastOrderTime" min-width="170" />
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />
       <el-table-column label="备注" align="center" prop="remark"  width="80"/>
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
       <!-- <el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" /> -->
diff --git a/src/views/emis/emisCustomerUser/monthUserList.vue b/src/views/emis/emisCustomerUser/monthUserList.vue
index 3a7bc736..5054c36f 100644
--- a/src/views/emis/emisCustomerUser/monthUserList.vue
+++ b/src/views/emis/emisCustomerUser/monthUserList.vue
@@ -217,11 +217,11 @@
       <el-table-column :label="$t('最近下单时间')" align="center" prop="loginDate" min-width="170" />
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="100" />
       <el-table-column label="备注" align="center" prop="remark"  width="80"/>
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
       <!-- <el-table-column :label="$t('排序')" align="center" prop="orderNum" min-width="100" /> -->
diff --git a/src/views/emis/emisDestination/index.vue b/src/views/emis/emisDestination/index.vue
index 9029fd7f..8ec5a8c2 100644
--- a/src/views/emis/emisDestination/index.vue
+++ b/src/views/emis/emisDestination/index.vue
@@ -159,11 +159,11 @@
             <!-- <dict-tag :options="dict.type.sys_biz_enable_status" :value="scope.row.status"/> -->
           </template>
         </el-table-column>
-        <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-        <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
         <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-        <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-        <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
         <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/emis/emisElectronicPag/index.vue b/src/views/emis/emisElectronicPag/index.vue
index 577c69f2..d4a308ac 100644
--- a/src/views/emis/emisElectronicPag/index.vue
+++ b/src/views/emis/emisElectronicPag/index.vue
@@ -78,11 +78,11 @@
       </el-table-column>
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <!-- <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/> -->
 
     </xd-table>
diff --git a/src/views/emis/emisGoods/emisGoodsForm.vue b/src/views/emis/emisGoods/emisGoodsForm.vue
index cc6be449..80d7d62a 100644
--- a/src/views/emis/emisGoods/emisGoodsForm.vue
+++ b/src/views/emis/emisGoods/emisGoodsForm.vue
@@ -12,11 +12,11 @@
               <el-input v-model="form.goodsNameEn" placeholder="请输入货物英文名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="货号" prop="goodsSn">
               <el-input v-model="form.goodsSn" placeholder="货号" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="规格" prop="goodsModel">
               <el-input v-model="form.goodsModel" placeholder="请输入规格" />
diff --git a/src/views/emis/emisGoods/index.vue b/src/views/emis/emisGoods/index.vue
index 41ffb8b2..b33ff6cd 100644
--- a/src/views/emis/emisGoods/index.vue
+++ b/src/views/emis/emisGoods/index.vue
@@ -506,11 +506,11 @@
       <el-table-column :label="$t('口岸编码')" align="center" prop="portCode" min-width="100" />
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
       <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" /> -->
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/emis/emisMaterial/index.vue b/src/views/emis/emisMaterial/index.vue
index adc11173..7c7b4ee0 100644
--- a/src/views/emis/emisMaterial/index.vue
+++ b/src/views/emis/emisMaterial/index.vue
@@ -164,11 +164,11 @@
          </template>
        </el-table-column>
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
diff --git a/src/views/emis/emisMonthpayAccount/index.vue b/src/views/emis/emisMonthpayAccount/index.vue
index 9d49a7d1..516c1b3a 100644
--- a/src/views/emis/emisMonthpayAccount/index.vue
+++ b/src/views/emis/emisMonthpayAccount/index.vue
@@ -137,11 +137,11 @@
       <el-table-column :label="$t('归属网点')" align="center" prop="ownerSiteName" width="100" />
       <el-table-column :label="$t('回款联系人')" align="center" prop="payeeName" width="100" />
       <el-table-column :label="$t('销售联系人')" align="center" prop="salesmenName" width="100" />
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
       <!-- <el-table-column :label="$t('所属业务员')" align="center" prop="marketMan" min-width="100" /> -->
diff --git a/src/views/emis/emisMonthpayUseApply/index.vue b/src/views/emis/emisMonthpayUseApply/index.vue
index 157f69c1..73c31027 100644
--- a/src/views/emis/emisMonthpayUseApply/index.vue
+++ b/src/views/emis/emisMonthpayUseApply/index.vue
@@ -211,11 +211,11 @@
       <el-table-column :label="$t('审核验证码')" align="center" prop="msgCode" min-width="100" />
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/emis/emisNotCalcAging/index.vue b/src/views/emis/emisNotCalcAging/index.vue
index 4b9d90d9..c1f85860 100644
--- a/src/views/emis/emisNotCalcAging/index.vue
+++ b/src/views/emis/emisNotCalcAging/index.vue
@@ -110,11 +110,11 @@
         </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="100" />
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/emis/emisPrintTpl/index.vue b/src/views/emis/emisPrintTpl/index.vue
index 5e087215..0aae50f0 100644
--- a/src/views/emis/emisPrintTpl/index.vue
+++ b/src/views/emis/emisPrintTpl/index.vue
@@ -138,11 +138,11 @@
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
 
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
diff --git a/src/views/emis/emisProblemType/index.vue b/src/views/emis/emisProblemType/index.vue
index d7c17ff7..4135b536 100644
--- a/src/views/emis/emisProblemType/index.vue
+++ b/src/views/emis/emisProblemType/index.vue
@@ -127,11 +127,11 @@
         </el-table-column>
         <el-table-column label="排序" align="center" prop="orderNum" width="80" :sort-orders="['descending','ascending']" sortable="custom" />
         <el-table-column label="备注" align="center" prop="remark"  width="80"/>
-        <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-        <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
         <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-        <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-        <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
         <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/emis/emisQuotePrice/specialQuotePriceList.vue b/src/views/emis/emisQuotePrice/specialQuotePriceList.vue
index 19bd29ce..3f5996b8 100644
--- a/src/views/emis/emisQuotePrice/specialQuotePriceList.vue
+++ b/src/views/emis/emisQuotePrice/specialQuotePriceList.vue
@@ -202,11 +202,11 @@
       <el-table-column label="派件网点" align="center" prop="dispAreaSite" :show-overflow-tooltip="true" min-width="100" />
 
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/emis/emisQuotePrice/transQuotePriceList.vue b/src/views/emis/emisQuotePrice/transQuotePriceList.vue
index 141cf470..bbe918a8 100644
--- a/src/views/emis/emisQuotePrice/transQuotePriceList.vue
+++ b/src/views/emis/emisQuotePrice/transQuotePriceList.vue
@@ -202,11 +202,11 @@
       <el-table-column label="派件网点" align="center" prop="dispAreaSite" :show-overflow-tooltip="true" min-width="100" />
 
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
diff --git a/src/views/emis/emisQuotePrice/vipSpecialQuotePriceList.vue b/src/views/emis/emisQuotePrice/vipSpecialQuotePriceList.vue
index 7e0caf72..a6dc1f20 100644
--- a/src/views/emis/emisQuotePrice/vipSpecialQuotePriceList.vue
+++ b/src/views/emis/emisQuotePrice/vipSpecialQuotePriceList.vue
@@ -206,11 +206,11 @@
       <el-table-column label="派件网点" align="center" prop="dispAreaSite" :show-overflow-tooltip="true" min-width="100" />
 
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/emis/emisQuotePrice/vipTransQuotePriceList.vue b/src/views/emis/emisQuotePrice/vipTransQuotePriceList.vue
index 7e762e66..75e97c6b 100644
--- a/src/views/emis/emisQuotePrice/vipTransQuotePriceList.vue
+++ b/src/views/emis/emisQuotePrice/vipTransQuotePriceList.vue
@@ -207,11 +207,11 @@
       <el-table-column label="派件网点" align="center" prop="dispAreaSite" :show-overflow-tooltip="true" min-width="100" />
 
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
diff --git a/src/views/emis/emisRegion/PcdPanel.vue b/src/views/emis/emisRegion/PcdPanel.vue
index 6cb92128..ea9540c9 100644
--- a/src/views/emis/emisRegion/PcdPanel.vue
+++ b/src/views/emis/emisRegion/PcdPanel.vue
@@ -142,11 +142,11 @@
            <!-- <el-table-column :label="$t('国家代码')" align="center" prop="countryCode" min-width="100" /> -->
           <el-table-column :label="$t('所属国家')" align="center" prop="countryName" width="80" />
           <!-- <el-table-column label="备注" align="center" prop="remark" min-width="100" /> -->
-          <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-          <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
           <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-          <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-          <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
           <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/emis/emisSite/index.vue b/src/views/emis/emisSite/index.vue
index 552335e3..f0f1cb57 100644
--- a/src/views/emis/emisSite/index.vue
+++ b/src/views/emis/emisSite/index.vue
@@ -210,11 +210,11 @@
         <el-table-column label="数据来源" align="center" prop="dataFrom"  width="80"/>
 
 
-        <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-          <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+        <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
           <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-          <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-          <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
           <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
diff --git a/src/views/emis/emisSiteAccount/index.vue b/src/views/emis/emisSiteAccount/index.vue
index 3e1b60cb..9d7af977 100644
--- a/src/views/emis/emisSiteAccount/index.vue
+++ b/src/views/emis/emisSiteAccount/index.vue
@@ -300,11 +300,11 @@
       <el-table-column label="清理人编号" align="center" prop="clearManCode" min-width="100" />
       <el-table-column label="备注" align="center" prop="remark" min-width="100" />
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
diff --git a/src/views/emis/emisSpecialCalcWeight/index.vue b/src/views/emis/emisSpecialCalcWeight/index.vue
index de8e8c28..94c968e5 100644
--- a/src/views/emis/emisSpecialCalcWeight/index.vue
+++ b/src/views/emis/emisSpecialCalcWeight/index.vue
@@ -111,11 +111,11 @@
       <el-table-column :label="$t('失效时间')" align="center" prop="endDate" min-width="170" />
       <!-- <el-table-column :label="$t('启用状态')" align="center" prop="status" min-width="100" /> -->
       <!-- <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
diff --git a/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue b/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue
index f66efe81..49daefe8 100644
--- a/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue
+++ b/src/views/emis/emisTmsScanRecord/scanRecordQuery.vue
@@ -46,7 +46,7 @@
                 clearable
                 v-model="queryParams.scanType"
             >
-                <el-option v-for="item in dict.type.emis_scan_type" :key="item.value" :label="item.label" :value="item.label" />
+                <el-option v-for="item in dict.type.emis_scan_type" :key="item.value" :label="item.label" :value="item.value" />
               </el-select>
           </el-form-item>
         </el-col>
@@ -148,7 +148,7 @@
 
       <el-table-column type="selection" width="55" align="center" />
 
-      <el-table-column :label="$t('单号')" align="center" prop="queryType" min-width="100">
+      <el-table-column :label="$t('单号')" align="center" prop="queryType" min-width="170">
         <template slot-scope="scope">
           <span>{{scope.row.queryType=="1"?scope.row.billCode:scope.row.orderSN}}</span>
         </template>
diff --git a/src/views/emis/emisTransLine/index.vue b/src/views/emis/emisTransLine/index.vue
index b3bdac8e..a1223655 100644
--- a/src/views/emis/emisTransLine/index.vue
+++ b/src/views/emis/emisTransLine/index.vue
@@ -148,11 +148,11 @@
           </template>
       </el-table-column>
       <el-table-column label="排序" align="center" prop="orderNum" width="100" :sort-orders="['descending','ascending']" sortable="custom" />
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/emis/emisTransProduct/index.vue b/src/views/emis/emisTransProduct/index.vue
index a8d97680..5fd017fa 100644
--- a/src/views/emis/emisTransProduct/index.vue
+++ b/src/views/emis/emisTransProduct/index.vue
@@ -162,11 +162,11 @@
         </template>
       </el-table-column>
       <el-table-column label="排序" align="center" prop="orderNum" width="100" :sort-orders="['descending','ascending']" sortable="custom" />
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/emis/emisUser/index.vue b/src/views/emis/emisUser/index.vue
index b1747081..bc3bae12 100644
--- a/src/views/emis/emisUser/index.vue
+++ b/src/views/emis/emisUser/index.vue
@@ -212,11 +212,11 @@
             </template>
           </el-table-column> -->
 
-          <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-          <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
           <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-          <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-          <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+          <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
           <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
diff --git a/src/views/emis/emisWarehouseIn/index.vue b/src/views/emis/emisWarehouseIn/index.vue
index ddf78ffd..8d2a599c 100644
--- a/src/views/emis/emisWarehouseIn/index.vue
+++ b/src/views/emis/emisWarehouseIn/index.vue
@@ -220,11 +220,11 @@
       <el-table-column :label="$t('状态')" align="center" prop="status" min-width="100" />
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
diff --git a/src/views/emis/emisWarehouseInBatch/index.vue b/src/views/emis/emisWarehouseInBatch/index.vue
index 47faa15f..2c3bf780 100644
--- a/src/views/emis/emisWarehouseInBatch/index.vue
+++ b/src/views/emis/emisWarehouseInBatch/index.vue
@@ -258,11 +258,11 @@
       <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
 
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
diff --git a/src/views/emis/emisWaybill/A4WaybillIPrinted.vue b/src/views/emis/emisWaybill/A4WaybillIPrinted.vue
index 44bfd01b..f8762e02 100644
--- a/src/views/emis/emisWaybill/A4WaybillIPrinted.vue
+++ b/src/views/emis/emisWaybill/A4WaybillIPrinted.vue
@@ -446,11 +446,11 @@
 
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
diff --git a/src/views/emis/emisWaybill/centerWaybillList.vue b/src/views/emis/emisWaybill/centerWaybillList.vue
index 49c4c4c7..d7892b02 100644
--- a/src/views/emis/emisWaybill/centerWaybillList.vue
+++ b/src/views/emis/emisWaybill/centerWaybillList.vue
@@ -535,11 +535,11 @@
 
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
diff --git a/src/views/emis/emisWaybill/dispatchWaybillList.vue b/src/views/emis/emisWaybill/dispatchWaybillList.vue
index 7ddf304e..5d02117f 100644
--- a/src/views/emis/emisWaybill/dispatchWaybillList.vue
+++ b/src/views/emis/emisWaybill/dispatchWaybillList.vue
@@ -541,11 +541,11 @@
 
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
diff --git a/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue b/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
index f48fc8fb..6a86777f 100644
--- a/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
+++ b/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
@@ -23,7 +23,7 @@
         <!-- <el-col :span="16"> -->
         <!-- </el-col> -->
         <el-col :span="8">
-          <el-form-item :label="$t('上传网点')" prop="createSite" label-width="100px">
+          <el-form-item :label="$t('上传网点')" prop="createSiteName" label-width="100px">
             <EmisSiteSimplePicker v-model="queryParams.createSite"  @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker>
           </el-form-item>
         </el-col>
@@ -89,8 +89,8 @@
       <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="150" />
       <el-table-column :label="$t('图片类型')" align="center" prop="attachType" min-width="100" />
       <el-table-column :label="$t('图片URL')" align="center" prop="fileUrl" min-width="100" />
-      <el-table-column :label="$t('上传网点')" align="center" prop="createSite" min-width="100" />
-      <el-table-column :label="$t('上传人')" align="center" prop="createBy" min-width="100" />
+      <el-table-column :label="$t('上传网点')" align="center" prop="createSiteName" min-width="100" />
+      <el-table-column :label="$t('上传人')" align="center" prop="createByName" min-width="100" />
       <el-table-column :label="$t('上传时间')" align="center" prop="createTime" min-width="170" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
diff --git a/src/views/emis/emisWaybill/orderList.vue b/src/views/emis/emisWaybill/orderList.vue
index d3c0163d..bef070c9 100644
--- a/src/views/emis/emisWaybill/orderList.vue
+++ b/src/views/emis/emisWaybill/orderList.vue
@@ -426,11 +426,11 @@
       <el-table-column :label="$t('订单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
diff --git a/src/views/emis/emisWaybill/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index beb15b87..36191efe 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -543,11 +543,11 @@
 
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
diff --git a/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue b/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue
index a7702240..096b1bcc 100644
--- a/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue
+++ b/src/views/emis/emisWaybill/uploadThePictureOfTheSendWaybillShipment.vue
@@ -49,8 +49,8 @@
 
       <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="150" />
       <el-table-column :label="$t('图片URL')" align="center" prop="fileUrl" min-width="100" />
-      <el-table-column :label="$t('上传网点')" align="center" prop="createSite" min-width="100" />
-      <el-table-column :label="$t('上传人')" align="center" prop="createBy" min-width="100" />
+      <el-table-column :label="$t('上传网点')" align="center" prop="createSiteName" min-width="100" />
+      <el-table-column :label="$t('上传人')" align="center" prop="createByName" min-width="100" />
       <el-table-column :label="$t('大小')" align="center" prop="volumeWeight" min-width="100">
         <template slot-scope="scope">
             <span>{{ scope.row.fileSiez + "KB" }}</span>
diff --git a/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue b/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue
index 9291633a..f4d557b6 100644
--- a/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue
+++ b/src/views/emis/emisWaybill/uploadThePictureOfTheWaybillSigning.vue
@@ -49,8 +49,8 @@
 
       <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="150" />
       <el-table-column :label="$t('图片URL')" align="center" prop="fileUrl" min-width="100" />
-      <el-table-column :label="$t('上传网点')" align="center" prop="createSite" min-width="100" />
-      <el-table-column :label="$t('上传人')" align="center" prop="createBy" min-width="100" />
+      <el-table-column :label="$t('上传网点')" align="center" prop="createSiteName" min-width="100" />
+      <el-table-column :label="$t('上传人')" align="center" prop="createByName" min-width="100" />
       <el-table-column :label="$t('大小')" align="center" prop="volumeWeight" min-width="100">
         <template slot-scope="scope">
             <span>{{ scope.row.fileSiez + "KB" }}</span>
diff --git a/src/views/emis/emisWaybill/waybillIsPrinted.vue b/src/views/emis/emisWaybill/waybillIsPrinted.vue
index 01e540df..3835debc 100644
--- a/src/views/emis/emisWaybill/waybillIsPrinted.vue
+++ b/src/views/emis/emisWaybill/waybillIsPrinted.vue
@@ -457,11 +457,11 @@
 
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
diff --git a/src/views/emis/emisWaybill/waybillList.vue b/src/views/emis/emisWaybill/waybillList.vue
index 73d1c0f3..5319e046 100644
--- a/src/views/emis/emisWaybill/waybillList.vue
+++ b/src/views/emis/emisWaybill/waybillList.vue
@@ -487,11 +487,11 @@
 
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
diff --git a/src/views/emis/emisWaybillProblemInfo/index.vue b/src/views/emis/emisWaybillProblemInfo/index.vue
index 1da9f308..a9850979 100644
--- a/src/views/emis/emisWaybillProblemInfo/index.vue
+++ b/src/views/emis/emisWaybillProblemInfo/index.vue
@@ -327,11 +327,11 @@
       <el-table-column :label="$t('文件路径')" align="center" prop="filePath" min-width="100" />
       <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
 
-      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
 
diff --git a/src/views/emis/emisWaybillProblemInfo/problemEntry.vue b/src/views/emis/emisWaybillProblemInfo/problemEntry.vue
index 84dee0aa..9e5f7ac7 100644
--- a/src/views/emis/emisWaybillProblemInfo/problemEntry.vue
+++ b/src/views/emis/emisWaybillProblemInfo/problemEntry.vue
@@ -189,8 +189,8 @@
 <script>
 import { addEmisWaybillProblemInfo,listEmisWaybillProblemInfo } from "@/api/emis/emisWaybillProblemInfo";
 import { doScan } from "@/api/emis/emisTmsScanRecord";
-// import { listEmisWaybill } from "@/api/emis/emisWaybill";
-import { getWaybillDetail } from "@/api/emis/emisWaybill";
+import { listEmisWaybill } from "@/api/emis/emisWaybill";
+// import { getWaybillDetail } from "@/api/emis/emisWaybill";
 
 import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
 import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
diff --git a/src/views/system/domain/index.vue b/src/views/system/domain/index.vue
index cfa1f2ca..6595a6c0 100644
--- a/src/views/system/domain/index.vue
+++ b/src/views/system/domain/index.vue
@@ -99,9 +99,9 @@
       <!-- <el-table-column label="父域ID" align="center" prop="parentId" /> -->
       <!-- <el-table-column label="域logo" align="center" prop="logo"  min-width="150"/> -->
       <!-- <el-table-column label="删除标志（0代表存在 2代表删除）" align="center" prop="delFlag" /> -->
-      <!-- <el-table-column label="创建者" align="center" prop="createBy" /> -->
+      <!-- <el-table-column label="创建者" align="center" prop="createByName" /> -->
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="180"/>
-      <!-- <el-table-column label="更新者" align="center" prop="updateBy" /> -->
+      <!-- <el-table-column label="更新者" align="center" prop="updateByName" /> -->
       <!-- <el-table-column label="更新时间" align="center" prop="updateTime" /> -->
       <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -162,7 +162,7 @@
         <el-form-item label="创建者" prop="createBy">
           <el-input v-model="form.createBy" placeholder="请输入创建者" />
         </el-form-item>
-        <el-form-item label="更新者" prop="updateBy">
+        <el-form-item label="更新者" prop="updateByName">
           <el-input v-model="form.updateBy" placeholder="请输入更新者" />
         </el-form-item> -->
         <el-form-item label="备注" prop="remark">
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 7982b545..94b4f35f 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -88,7 +88,7 @@
           <dict-tag :options="dict.type.sys_notice_status" :value="scope.row.status"/>
         </template>
       </el-table-column>
-      <el-table-column label="创建者" align="center" prop="createBy" width="100" />
+      <el-table-column label="创建者" align="center" prop="createByName" width="100" />
       <el-table-column label="创建时间" align="center" prop="createTime" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
diff --git a/src/views/system/sysAccount/index.vue b/src/views/system/sysAccount/index.vue
index b34e29c2..5162c0e2 100644
--- a/src/views/system/sysAccount/index.vue
+++ b/src/views/system/sysAccount/index.vue
@@ -114,9 +114,9 @@
        </el-table-column>
       <!-- <el-table-column label="租户ID" align="center" prop="tenantId" min-width="100" /> -->
       <!-- <el-table-column label="删除标志（0代表存在 2代表删除）" align="center" prop="delFlag" min-width="100" /> -->
-      <!-- <el-table-column label="创建者" align="center" prop="createBy" min-width="100" /> -->
+      <!-- <el-table-column label="创建者" align="center" prop="createByName" min-width="100" /> -->
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="100" />
-      <!-- <el-table-column label="更新者" align="center" prop="updateBy" min-width="100" /> -->
+      <!-- <el-table-column label="更新者" align="center" prop="updateByName" min-width="100" /> -->
       <!-- <el-table-column label="更新时间" align="center" prop="updateTime" min-width="100" /> -->
       <el-table-column label="备注" align="center" prop="remark" min-width="100" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/system/sysAccountLog/index.vue b/src/views/system/sysAccountLog/index.vue
index 4156319c..d3bd12c6 100644
--- a/src/views/system/sysAccountLog/index.vue
+++ b/src/views/system/sysAccountLog/index.vue
@@ -108,7 +108,7 @@
           placeholder="请选择创建时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="更新者" prop="updateBy">
+      <el-form-item label="更新者" prop="updateByName">
         <el-input
           v-model="queryParams.updateBy"
           placeholder="请输入更新者"
@@ -247,7 +247,7 @@
       <!-- <el-table-column label="确认描述" align="center" prop="confirmStatusDesc" min-width="100" /> -->
       <!-- <el-table-column label="确认时间" align="center" prop="confirmTime" min-width="100" /> -->
       <!-- <el-table-column label="删除标志（0代表存在 2代表删除）" align="center" prop="delFlag" min-width="100" /> -->
-      <!-- <el-table-column label="创建者" align="center" prop="createBy" min-width="100" /> -->
+      <!-- <el-table-column label="创建者" align="center" prop="createByName" min-width="100" /> -->
       <el-table-column label="变动时间" align="center" prop="createTime" min-width="100" />
       <el-table-column label="备注" align="center" prop="remark" min-width="100" />
       <!-- <el-table-column label="异常信息" align="center" prop="exception" min-width="100" /> -->
diff --git a/src/views/system/sysAppinfo/index.vue b/src/views/system/sysAppinfo/index.vue
index 4ba2f49c..64a19951 100644
--- a/src/views/system/sysAppinfo/index.vue
+++ b/src/views/system/sysAppinfo/index.vue
@@ -182,8 +182,8 @@
       <el-table-column label="拥有人-userid" align="center" prop="ownerId" min-width="100" />
       <el-table-column label="备注" align="center" prop="remark" min-width="100" />
       <el-table-column label="删除标志（0代表存在 2代表删除）" align="center" prop="delFlag" min-width="100" />
-      <el-table-column label="创建者" align="center" prop="createBy" min-width="100" />
-      <el-table-column label="更新者" align="center" prop="updateBy" min-width="100" />
+      <el-table-column label="创建者" align="center" prop="createByName" min-width="100" />
+      <el-table-column label="更新者" align="center" prop="updateByName" min-width="100" />
       <el-table-column label="ext1" align="center" prop="ext1" min-width="100" />
       <el-table-column label="ext2" align="center" prop="ext2" min-width="100" />
       <el-table-column label="ext3" align="center" prop="ext3" min-width="100" />
@@ -301,7 +301,7 @@
         <el-form-item label="创建者" prop="createBy">
           <el-input v-model="form.createBy" placeholder="请输入创建者" />
         </el-form-item>
-        <el-form-item label="更新者" prop="updateBy">
+        <el-form-item label="更新者" prop="updateByName">
           <el-input v-model="form.updateBy" placeholder="请输入更新者" />
         </el-form-item>
         <el-form-item label="ext1" prop="ext1">
diff --git a/src/views/system/sysCostTime/index.vue b/src/views/system/sysCostTime/index.vue
index 9bb4d2e4..f5cfffac 100644
--- a/src/views/system/sysCostTime/index.vue
+++ b/src/views/system/sysCostTime/index.vue
@@ -75,7 +75,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="更新者" prop="updateBy">
+      <el-form-item label="更新者" prop="updateByName">
         <el-input
           v-model="queryParams.updateBy"
           placeholder="请输入更新者"
@@ -186,8 +186,8 @@
       <el-table-column label="方法名" align="center" prop="methodName" min-width="100" />
       <el-table-column label="消耗的时间" align="center" prop="spendTime" min-width="100" />
       <el-table-column label="删除标志（0代表存在 2代表删除）" align="center" prop="delFlag" min-width="100" />
-      <el-table-column label="创建者" align="center" prop="createBy" min-width="100" />
-      <el-table-column label="更新者" align="center" prop="updateBy" min-width="100" />
+      <el-table-column label="创建者" align="center" prop="createByName" min-width="100" />
+      <el-table-column label="更新者" align="center" prop="updateByName" min-width="100" />
       <el-table-column label="备注" align="center" prop="remark" min-width="100" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -241,7 +241,7 @@
         <el-form-item label="创建者" prop="createBy">
           <el-input v-model="form.createBy" placeholder="请输入创建者" />
         </el-form-item>
-        <el-form-item label="更新者" prop="updateBy">
+        <el-form-item label="更新者" prop="updateByName">
           <el-input v-model="form.updateBy" placeholder="请输入更新者" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
diff --git a/src/views/system/sysDynamicSql/index.vue b/src/views/system/sysDynamicSql/index.vue
index 0cd02d09..2cd31c36 100644
--- a/src/views/system/sysDynamicSql/index.vue
+++ b/src/views/system/sysDynamicSql/index.vue
@@ -78,8 +78,8 @@
          </template>
       </el-table-column>
       <!-- <el-table-column label="删除标志（0代表存在 2代表删除）" align="center" prop="delFlag" min-width="100" /> -->
-      <!-- <el-table-column label="创建者" align="center" prop="createBy" min-width="100" /> -->
-      <!-- <el-table-column label="更新者" align="center" prop="updateBy" min-width="100" /> -->
+      <!-- <el-table-column label="创建者" align="center" prop="createByName" min-width="100" /> -->
+      <!-- <el-table-column label="更新者" align="center" prop="updateByName" min-width="100" /> -->
       <!-- <el-table-column label="备注" align="center" prop="remark" min-width="100" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
diff --git a/src/views/system/sysI18n/index.vue b/src/views/system/sysI18n/index.vue
index ed8125d2..a16a7c5a 100644
--- a/src/views/system/sysI18n/index.vue
+++ b/src/views/system/sysI18n/index.vue
@@ -158,8 +158,8 @@
       <el-table-column label="value" align="center" prop="i18nValue" min-width="200" />
       <!-- <el-table-column label="英文名称" align="center" prop="i18nNameEn" min-width="100" /> -->
       <!-- <el-table-column label="删除标志（0代表存在 2代表删除）" align="center" prop="delFlag" min-width="100" />
-      <el-table-column label="创建者" align="center" prop="createBy" min-width="100" />
-      <el-table-column label="更新者" align="center" prop="updateBy" min-width="100" />
+      <el-table-column label="创建者" align="center" prop="createByName" min-width="100" />
+      <el-table-column label="更新者" align="center" prop="updateByName" min-width="100" />
       <el-table-column label="备注" align="center" prop="remark" min-width="100" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -219,7 +219,7 @@
         <el-form-item label="创建者" prop="createBy">
           <el-input v-model="form.createBy" placeholder="请输入创建者" />
         </el-form-item>
-        <el-form-item label="更新者" prop="updateBy">
+        <el-form-item label="更新者" prop="updateByName">
           <el-input v-model="form.updateBy" placeholder="请输入更新者" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
diff --git a/src/views/system/sysIpBlack/index.vue b/src/views/system/sysIpBlack/index.vue
index bf4f53c2..6caed885 100644
--- a/src/views/system/sysIpBlack/index.vue
+++ b/src/views/system/sysIpBlack/index.vue
@@ -107,7 +107,7 @@
           placeholder="请选择创建时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="" prop="updateBy">
+      <el-form-item label="" prop="updateByName">
         <el-input
           v-model="queryParams.updateBy"
           placeholder="更新者"
@@ -229,9 +229,9 @@
       <el-table-column label="黑名单结束时间" align="center" prop="disableTime" min-width="100" />
       <el-table-column label="租户ID" align="center" prop="tenantId" min-width="100" />
       <el-table-column label="删除标志（0代表存在 2代表删除）" align="center" prop="delFlag" min-width="100" />
-      <el-table-column label="创建者" align="center" prop="createBy" min-width="100" />
+      <el-table-column label="创建者" align="center" prop="createByName" min-width="100" />
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="100" />
-      <el-table-column label="更新者" align="center" prop="updateBy" min-width="100" />
+      <el-table-column label="更新者" align="center" prop="updateByName" min-width="100" />
       <el-table-column label="更新时间" align="center" prop="updateTime" min-width="100" />
       <el-table-column label="备注" align="center" prop="remark" min-width="100" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -319,7 +319,7 @@
             placeholder="请选择创建时间">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="更新者" prop="updateBy">
+        <el-form-item label="更新者" prop="updateByName">
           <el-input v-model="form.updateBy" placeholder="请输入更新者" />
         </el-form-item>
         <el-form-item label="更新时间" prop="updateTime">
diff --git a/src/views/system/sysMerchant/index.vue b/src/views/system/sysMerchant/index.vue
index 12d40134..5a0e3cf1 100644
--- a/src/views/system/sysMerchant/index.vue
+++ b/src/views/system/sysMerchant/index.vue
@@ -154,8 +154,8 @@
       <el-table-column label="经营状态" align="center" prop="businessStatus" min-width="100" />
       <el-table-column label="行业" align="center" prop="industry" min-width="100" />
       <el-table-column label="删除标志（0代表存在 2代表删除）" align="center" prop="delFlag" min-width="100" />
-      <el-table-column label="创建者" align="center" prop="createBy" min-width="100" />
-      <el-table-column label="更新者" align="center" prop="updateBy" min-width="100" />
+      <el-table-column label="创建者" align="center" prop="createByName" min-width="100" />
+      <el-table-column label="更新者" align="center" prop="updateByName" min-width="100" />
       <el-table-column label="备注" align="center" prop="remark" min-width="100" />-->
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="170" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -292,7 +292,7 @@
         <el-form-item label="创建者" prop="createBy">
           <el-input v-model="form.createBy" placeholder="请输入创建者" />
         </el-form-item>
-        <el-form-item label="更新者" prop="updateBy">
+        <el-form-item label="更新者" prop="updateByName">
           <el-input v-model="form.updateBy" placeholder="请输入更新者" />
         </el-form-item> -->
         <el-form-item label="归属租户" prop="tenantId">
diff --git a/src/views/system/sysMerchantService/index.vue b/src/views/system/sysMerchantService/index.vue
index bd822299..1e067ff1 100644
--- a/src/views/system/sysMerchantService/index.vue
+++ b/src/views/system/sysMerchantService/index.vue
@@ -217,7 +217,7 @@
         <el-form-item label="创建者" prop="createBy">
           <el-input v-model="form.createBy" placeholder="请输入创建者" />
         </el-form-item>
-        <el-form-item label="更新者" prop="updateBy">
+        <el-form-item label="更新者" prop="updateByName">
           <el-input v-model="form.updateBy" placeholder="请输入更新者" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
diff --git a/src/views/system/sysTenantBizApp/index.vue b/src/views/system/sysTenantBizApp/index.vue
index 4b79de8d..0d91748f 100644
--- a/src/views/system/sysTenantBizApp/index.vue
+++ b/src/views/system/sysTenantBizApp/index.vue
@@ -153,9 +153,9 @@
           </template>
        </el-table-column>
       <!-- <el-table-column label="删除标志" align="center" prop="delFlag" min-width="100" /> -->
-      <!-- <el-table-column label="创建者" align="center" prop="createBy" min-width="100" /> -->
+      <!-- <el-table-column label="创建者" align="center" prop="createByName" min-width="100" /> -->
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="170" />
-      <!-- <el-table-column label="更新者" align="center" prop="updateBy" min-width="100" />
+      <!-- <el-table-column label="更新者" align="center" prop="updateByName" min-width="100" />
       <el-table-column label="更新时间" align="center" prop="updateTime" min-width="100" />
       <el-table-column label="备注" align="center" prop="remark" min-width="100" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
diff --git a/src/views/system/sysZoneNav/index.vue b/src/views/system/sysZoneNav/index.vue
index 083464fc..2848925c 100644
--- a/src/views/system/sysZoneNav/index.vue
+++ b/src/views/system/sysZoneNav/index.vue
@@ -126,8 +126,8 @@
       <!-- <el-table-column label="显示状态（0显示 1隐藏）" align="center" prop="visible" min-width="100" /> -->
       <!-- <el-table-column label="停用状态（0正常 1停用）" align="center" prop="status" min-width="100" /> -->
       <el-table-column label="所属站点" align="center" prop="zoneId" min-width="100" />
-      <!-- <el-table-column label="创建者" align="center" prop="createBy" min-width="100" /> -->
-      <!-- <el-table-column label="更新者" align="center" prop="updateBy" min-width="100" /> -->
+      <!-- <el-table-column label="创建者" align="center" prop="createByName" min-width="100" /> -->
+      <!-- <el-table-column label="更新者" align="center" prop="updateByName" min-width="100" /> -->
       <!-- <el-table-column label="备注" align="center" prop="remark" min-width="100" /> -->
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="170" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -191,7 +191,7 @@
         <!-- <el-form-item label="创建者" prop="createBy">
           <el-input v-model="form.createBy" placeholder="请输入创建者" />
         </el-form-item>
-        <el-form-item label="更新者" prop="updateBy">
+        <el-form-item label="更新者" prop="updateByName">
           <el-input v-model="form.updateBy" placeholder="请输入更新者" />
         </el-form-item> -->
         <el-form-item label="备注" prop="remark">
diff --git a/src/views/system/sysZoneNav/navEditor.vue b/src/views/system/sysZoneNav/navEditor.vue
index b718fb70..f820aa64 100644
--- a/src/views/system/sysZoneNav/navEditor.vue
+++ b/src/views/system/sysZoneNav/navEditor.vue
@@ -60,8 +60,8 @@
       <!-- <el-table-column label="显示状态（0显示 1隐藏）" align="center" prop="visible" min-width="100" /> -->
       <!-- <el-table-column label="停用状态（0正常 1停用）" align="center" prop="status" min-width="100" /> -->
       <!-- <el-table-column label="所属站点" align="center" prop="zoneId" min-width="100" /> -->
-      <!-- <el-table-column label="创建者" align="center" prop="createBy" min-width="100" /> -->
-      <!-- <el-table-column label="更新者" align="center" prop="updateBy" min-width="100" /> -->
+      <!-- <el-table-column label="创建者" align="center" prop="createByName" min-width="100" /> -->
+      <!-- <el-table-column label="更新者" align="center" prop="updateByName" min-width="100" /> -->
       <!-- <el-table-column label="备注" align="center" prop="remark" min-width="100" /> -->
       <!-- <el-table-column label="创建时间" align="center" prop="createTime" min-width="170" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -114,7 +114,7 @@
         <!-- <el-form-item label="创建者" prop="createBy">
           <el-input v-model="form.createBy" placeholder="请输入创建者" />
         </el-form-item>
-        <el-form-item label="更新者" prop="updateBy">
+        <el-form-item label="更新者" prop="updateByName">
           <el-input v-model="form.updateBy" placeholder="请输入更新者" />
         </el-form-item> -->
         <!-- <el-form-item label="备注" prop="remark">
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 232b1d9e..abea3303 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -130,9 +130,9 @@
       <!-- <el-table-column label="企业id" align="center" prop="orgid" /> -->
       <!-- <el-table-column label="租户类型 0-内部租户 1-快递公司 2-打单客户 3-清关客户" align="center" prop="tenantType" /> -->
       <!-- <el-table-column label="删除标志（0代表存在 2代表删除）" align="center" prop="delFlag" /> -->
-      <!-- <el-table-column label="创建者" align="center" prop="createBy" /> -->
+      <!-- <el-table-column label="创建者" align="center" prop="createByName" /> -->
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="170"/>
-      <!-- <el-table-column label="更新者" align="center" prop="updateBy" /> -->
+      <!-- <el-table-column label="更新者" align="center" prop="updateByName" /> -->
       <!-- <el-table-column label="更新时间" align="center" prop="updateTime" /> -->
       <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
       <el-table-column label="操作" align="center"  >
@@ -254,7 +254,7 @@
         <el-form-item label="创建者" prop="createBy">
           <el-input v-model="form.createBy" placeholder="请输入创建者" />
         </el-form-item>
-        <el-form-item label="更新者" prop="updateBy">
+        <el-form-item label="更新者" prop="updateByName">
           <el-input v-model="form.updateBy" placeholder="请输入更新者" />
         </el-form-item> -->
         <el-form-item label="备注" prop="remark">
diff --git a/src/views/wms/wmsWarehouse/index.vue b/src/views/wms/wmsWarehouse/index.vue
index 6e184d6d..96360182 100644
--- a/src/views/wms/wmsWarehouse/index.vue
+++ b/src/views/wms/wmsWarehouse/index.vue
@@ -135,8 +135,8 @@
       <el-table-column label="扩展参数" align="center" prop="extParam" min-width="100" /> -->
       <!-- <el-table-column label="租户ID" align="center" prop="tenantId" min-width="100" />
       <el-table-column label="删除标志（0代表存在 2代表删除）" align="center" prop="delFlag" min-width="100" />
-      <el-table-column label="创建者" align="center" prop="createBy" min-width="100" />
-      <el-table-column label="更新者" align="center" prop="updateBy" min-width="100" />
+      <el-table-column label="创建者" align="center" prop="createByName" min-width="100" />
+      <el-table-column label="更新者" align="center" prop="updateByName" min-width="100" />
       <el-table-column label="备注" align="center" prop="remark" min-width="100" /> -->
       <!-- <el-table-column label="创建时间" align="center" prop="createTime" min-width="170" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" min-width="200">