From 4fc1be40676b5f9928da3a83bdb1c215d0584ae9 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期一, 06 四月 2026 11:15:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://115.159.85.185:8098/r/SuZhouGuanHong/ShanMeiXinNengYuan into dev

---
 Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue b/Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
index 1c1154f..336c440 100644
--- a/Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
+++ b/Code/WCS/WIDESEAWCS_Client/src/views/taskinfo/task.vue
@@ -52,7 +52,7 @@
         },
         {
           title: "浠诲姟鐘舵��",
-          field: "taskState",
+          field: "taskStatus",
           type: "selectList",
           dataKey: "taskState",
           data: [],
@@ -111,7 +111,7 @@
         bind: { key: "taskType", data: [] },
       },
       {
-        field: "taskState",
+        field: "taskStatus",
         title: "浠诲姟鐘舵��",
         type: "int",
         width: 150,

--
Gitblit v1.9.3