From 7b6329313ca3a5e6ff96246eeaf96f839df7760b Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 22 十月 2025 11:51:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

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

diff --git a/src/main/webapp/static/js/basArmMastLog/basArmMastLog.js b/src/main/webapp/static/js/basArmMastLog/basArmMastLog.js
index 5bc4c6d..edd68cd 100644
--- a/src/main/webapp/static/js/basArmMastLog/basArmMastLog.js
+++ b/src/main/webapp/static/js/basArmMastLog/basArmMastLog.js
@@ -40,6 +40,7 @@
             ,{field: 'supplier', align: 'center',title: '璐ф簮',hide: false}
             ,{field: 'ctns', align: 'center',title: '绠辨暟',hide: true}
             ,{field: 'createTime', align: 'center',title: '鏃堕棿鎴�',hide: true}
+            ,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�',hide: false}
             ,{field: 'armError', align: 'center',title: '寮傚父浠ｇ爜',hide: true}
             ,{field: 'armMsg', align: 'center',title: '寮傚父淇℃伅',hide: true}
 

--
Gitblit v1.9.1