From 1dbdcf2bf037a06f0a498c84520c8d75ca8de1c0 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 01 九月 2023 08:50:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zjfnasrs' into zjfnasrs

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

diff --git a/src/main/webapp/static/js/basErrLog/basErrLog.js b/src/main/webapp/static/js/basErrLog/basErrLog.js
index a38e3b6..8f4b314 100644
--- a/src/main/webapp/static/js/basErrLog/basErrLog.js
+++ b/src/main/webapp/static/js/basErrLog/basErrLog.js
@@ -32,7 +32,7 @@
             ,{field: 'staNo', align: 'center',title: '鐩爣绔�', hide: true}
             ,{field: 'sourceStaNo', align: 'center',title: '婧愮珯', hide: true}
             ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�', hide: true}
-            ,{field: 'barcode', align: 'center',title: '鏉$爜', hide: true}
+            ,{field: 'barcode', align: 'center',title: 'pack鐮�', hide: true}
             ,{field: 'errCode', align: 'center',title: '寮傚父鐮�'}
             ,{field: 'error', align: 'center',title: '寮傚父鎻忚堪'}
             ,{field: 'status$', align: 'center',title: '寮傚父鎯呭喌'}

--
Gitblit v1.9.1