From ec8120682339a7b9feb64748320781e99fa0cb77 Mon Sep 17 00:00:00 2001
From: zc <zc>
Date: 星期五, 13 九月 2024 16:57:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xgmFlasrs' into xgmFlasrs

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

diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 9999e33..323b6b5 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -227,8 +227,8 @@
     ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', sort:true}
     ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
     ,{field: 'spgNO', align: 'center',title: '娲惧伐鍗曞彿', sort:true}
-    ,{field: 'outOrderNo', align: 'center',title: '鎵规', sort:true}
-    ,{field: 'spgNO', align: 'center',title: '璁㈠崟鍙�', sort:true}
+    ,{field: 'batch', align: 'center',title: '鎵规', sort:true}
+    ,{field: 'outOrderNo', align: 'center',title: '璁㈠崟鍙�', sort:true}
     ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
     ,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
     ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}

--
Gitblit v1.9.1