From 51b59b6534012af93c35bcb9c95086b64f5dfe7e Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 12 九月 2022 13:53:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zypms' into zypms

---
 src/main/webapp/static/js/itemManager/itemManager.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/static/js/itemManager/itemManager.js b/src/main/webapp/static/js/itemManager/itemManager.js
index dcb41b3..e033165 100644
--- a/src/main/webapp/static/js/itemManager/itemManager.js
+++ b/src/main/webapp/static/js/itemManager/itemManager.js
@@ -28,7 +28,7 @@
             ,{field: 'name', align: 'center',title: '椤圭洰鍚嶇О', width: 130}
             ,{field: 'inUuid', align: 'center',title: '椤圭洰缂栧彿', hide: true}
             // ,{field: 'cstmrUuid', align: 'center',title: '瀹㈡埛缂栧彿'}
-            ,{field: 'progressRate$', align: 'center',title: '杩涘害'}
+            ,{field: 'projectStatus$', align: 'center',title: '杩涘害'}
             ,{field: 'planCarInfo', align: 'center', title: '棰勮杞﹁締澶у皬', width: 115}
             ,{field: 'planCarnumber', align: 'center', title: '棰勮杞﹁締鏁伴噺', width: 115}
             // ,{field: 'member', align: 'center',title: '椤圭洰鎴愬憳'}

--
Gitblit v1.9.1