From 09211d189468e0901180c4dde8340d5487657ccb Mon Sep 17 00:00:00 2001
From: Administrator <335182714>
Date: 星期四, 31 七月 2025 10:50:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ghjtasrs' into ghjtasrs

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

diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 39429d6..320f168 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -248,8 +248,8 @@
                             {type: 'numbers'},
                             {field: 'brand', title: '鍖呰缁勫彿', width: 160},
                             // {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
-                            // {field: 'batch', title: '绠卞彿'},
-                            // {field: 'anfme', title: '鏁伴噺'},
+                            {field: 'supp', title: '瀹㈡埛鍚嶇О'},
+                            {field: 'memo', title: '澶囨敞'},
                             // {field: 'workQty', title: '浣滀笟鏁伴噺'},
 
                             // {field: 'unit', title: '鍗曚綅'},

--
Gitblit v1.9.1