From a484168b903a919b24d65a5d95dea88a04d8f34c Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 26 十二月 2024 13:50:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs

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

diff --git a/src/main/webapp/static/js/pakStore/locCheckOut.js b/src/main/webapp/static/js/pakStore/locCheckOut.js
index 0649af5..8bbcf0d 100644
--- a/src/main/webapp/static/js/pakStore/locCheckOut.js
+++ b/src/main/webapp/static/js/pakStore/locCheckOut.js
@@ -1,8 +1,9 @@
 var locDetlLayerIdx;
 var tableIns;
+var locDetlData = [];
 function getCol() {
     var cols = [
-        {field: 'locNo', align: 'center',title: '搴撲綅鍙�', merge: true, style: 'font-weight: bold'}
+        {field: 'locNo', align: 'center',title: '搴撲綅鍙�', style: 'font-weight: bold'}
     ];
     cols.push.apply(cols, detlCols);
     return cols;

--
Gitblit v1.9.1