From e27a4186c67c7087435c414a4338d2df48c81d63 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 28 十二月 2023 08:24:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion

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

diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index 6e77b6f..45c0879 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -10,7 +10,7 @@
 
         ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true, hide: true}
         ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
-        //,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
+        ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
         ,{field: 'model', align: 'center',title: '浠g爜', hide: true}
         ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
         ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
@@ -36,6 +36,7 @@
         ,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
         ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
         ,{field: 'owner$', align: 'center',title: '璐т富', hide: false}
+        ,{field: 'status$', align: 'center',title: '鏄庣粏閿�', hide: false}
         ,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��', hide: false}
 
     ];

--
Gitblit v1.9.1