From 133c3145d6feb59a1b4c29322097ba8772d2da00 Mon Sep 17 00:00:00 2001
From: 18516761980 <56479841@qq.com>
Date: 星期日, 21 八月 2022 13:45:10 +0800
Subject: [PATCH] Merge branch 'hylyasrs' of http://47.97.1.152:5880/r/zy-asrs into hylyasrs

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

diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 4645b46..55b4401 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -187,7 +187,7 @@
     // ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
     ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
     // ,{field: 'name', align: 'center',title: '鍒悕'}
-    ,{field: 'specs', align: 'center',title: '閰嶇疆'}
+    ,{field: 'specs', align: 'center',title: '瑙勬牸'}
     ,{field: 'model', align: 'center',title: '浠g爜', hide: false}
     ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
     ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
@@ -229,7 +229,7 @@
     ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
     ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉$爜'}
 
-    ,{field: 'specs', align: 'center',title: '閰嶇疆'}
+    ,{field: 'specs', align: 'center',title: '瑙勬牸'}
     ,{field: 'model', align: 'center',title: '浠g爜', hide: false}
     ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
     ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}

--
Gitblit v1.9.1