From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs

---
 src/main/webapp/views/taskWrkLog/taskWrkLog.html |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/views/taskWrkLog/taskWrkLog.html b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
index 254c9c5..7c4b892 100644
--- a/src/main/webapp/views/taskWrkLog/taskWrkLog.html
+++ b/src/main/webapp/views/taskWrkLog/taskWrkLog.html
@@ -55,9 +55,9 @@
 						</el-table-column>
 						<el-table-column property="wrkNo" label="宸ヤ綔鍙�">
 						</el-table-column>
-						<el-table-column property="createTime$" label="鍒涘缓鏃堕棿">
+						<el-table-column property="createTime$" label="鍒涘缓鏃堕棿" width="150">
 						</el-table-column>
-						<el-table-column property="durationTime" label="鎸佺画鏃堕暱">
+						<el-table-column property="completeTime$" label="瀹屾垚鏃堕棿" width="150">
 						</el-table-column>
 						<el-table-column property="ioType$" label="浠诲姟绫诲瀷">
 						</el-table-column>

--
Gitblit v1.9.1