From d60f2ca80ddbe1846fb7ad9fd1f1e2fb01c372fe Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期一, 22 七月 2024 09:20:27 +0800
Subject: [PATCH] 处理工单下发代码冲突
---
src/views/system/unit/people/index.vue | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/views/system/unit/people/index.vue b/src/views/system/unit/people/index.vue
index 65b6b0d..256399b 100644
--- a/src/views/system/unit/people/index.vue
+++ b/src/views/system/unit/people/index.vue
@@ -88,7 +88,7 @@
<el-table-column label="杩愮淮浜哄憳璐﹀彿" align="center" prop="ywPersonAccount" />
<el-table-column label="鎵�灞炶繍缁村崟浣�" align="center" prop="belongUnitName" />
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" />
- <el-table-column label="澶囨敞" align="center" prop="remark" />
+ <el-table-column label="澶囨敞" align="center" prop="remark" show-overflow-tooltip/>
<el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
--
Gitblit v1.8.0