From 6f7a815b2d6e4f30e7ccf901b24d5103aaa72078 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 25 十二月 2023 10:23:08 +0800
Subject: [PATCH] Merge branch 'tzskasrs-1' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-1

---
 src/main/webapp/views/pda/comb.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index ea35335..ada5b5c 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -56,7 +56,7 @@
             cols: [[
                 {fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
                 {field: 'matnr', align: 'center', title: '鐗╂枡鍙�'},
-                {field: 'maktx', align: 'center', title: '鐗╂枡鍙�'}
+                {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О'}
             ]],
             done: function (res, curr, count) {
             }

--
Gitblit v1.9.1