From a9bf1966f94955f542d39147fb1539befe2b4eec Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期四, 09 五月 2024 17:57:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 web/src/views/modules/taskReliability/Task.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/web/src/views/modules/taskReliability/Task.vue b/web/src/views/modules/taskReliability/Task.vue
index 74465c8..634b2ce 100644
--- a/web/src/views/modules/taskReliability/Task.vue
+++ b/web/src/views/modules/taskReliability/Task.vue
@@ -17,7 +17,7 @@
         <el-table-column type="selection" width="40" align="center"/>
         <el-table-column prop="taskName" label="浠诲姟鍚嶇О"/>
         <!--<el-table-column prop="taskSort" label="浠诲姟椤哄簭" align="center"/>-->
-        <el-table-column prop="phaseDuration" label="浠诲姟鏃堕暱鍒嗛厤" align="right"/>
+        <el-table-column prop="taskDuration" label="浠诲姟鎬绘椂闀�" align="right"/>
         <zt-table-column-handle :table="table"
                                 delete-perm="taskReliability::delete"/>
       </el-table>

--
Gitblit v1.9.1