From f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:16:02 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/webapp/static/js/inventoryVariance/inventoryVariance.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/static/js/inventoryVariance/inventoryVariance.js b/src/main/webapp/static/js/inventoryVariance/inventoryVariance.js
index de55347..dfc271e 100644
--- a/src/main/webapp/static/js/inventoryVariance/inventoryVariance.js
+++ b/src/main/webapp/static/js/inventoryVariance/inventoryVariance.js
@@ -2,7 +2,7 @@
var tableData;
function getCol() {
var cols = [
- {field: 'matnr', align: 'center',title: '瀛樿揣缂栫爜'}
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
,{field: 'csocode', align: 'center',title: '閿�鍞鍗曞彿', sort:true}
,{field: 'isoseq', align: 'center',title: '閿�鍞鍗曡鍙�', sort:true}
,{field: 'iquantity', align: 'center',title: 'ERP瀛樿揣鏁伴噺', sort:true}
--
Gitblit v1.9.1