Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/finance/index.vue

@@ -659,7 +659,7 @@
       <el-table :data="orderData" height="300">
         <el-table-column label="变更信息">
           <template #default="scope">
-            {{ `${scope.row.createBy}：${scope.row.createTime}` }}
+            {{ `${scope.row.createByName}：${scope.row.createTime}` }}
           </template>
         </el-table-column>
         <el-table-column prop="optContent" label="变更内容"></el-table-column>

src/views/insurancePolicy/viewDetail.vue

@@ -14,9 +14,9 @@
       <el-descriptions-item label="操作功能：" label-align="right" align="left" label-width="100">{{ moduleName
       }}</el-descriptions-item>
       <el-descriptions-item label="操作类型：" label-align="right" align="left" label-width="100">{{ optTypeMAP(detailData?.optType) }}</el-descriptions-item>
-      <el-descriptions-item label="操作人：" label-align="right" align="left" label-width="100">{{ detailData?.createBy
+      <el-descriptions-item label="操作人：" label-align="right" align="left" label-width="100">{{ detailData?.createByName || '--'
       }}</el-descriptions-item>
-      <el-descriptions-item label="操作时间：" label-align="right" align="left" label-width="100">{{ detailData?.createTime
+      <el-descriptions-item label="操作时间：" label-align="right" align="left" label-width="100">{{ detailData?.createTime || '--'
       }}</el-descriptions-item>
     </el-descriptions>
     <el-row :gutter="20" class="content">