From 07fc18f77a9764bd47857e30d65abc03cc1e439c Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 08 十一月 2024 16:21:56 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/webapp/static/js/staDesc/staDesc.js | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/static/js/staDesc/staDesc.js b/src/main/webapp/static/js/staDesc/staDesc.js
index 8e38517..7905eeb 100644
--- a/src/main/webapp/static/js/staDesc/staDesc.js
+++ b/src/main/webapp/static/js/staDesc/staDesc.js
@@ -25,8 +25,8 @@
// ,{field: 'typeDesc', align: 'center',title: '浣滀笟绫诲瀷'}
,{field: 'stnNo$', align: 'center',title: '浣滀笟绔欑偣'}
,{field: 'stnDesc', align: 'center',title: '绔欑偣鍚嶇О', edit:'text'}
- ,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈哄彿'}
- ,{field: 'crnStn$', align: 'center',title: '鍫嗗灈鏈虹珯鐐�'}
+ ,{field: 'crnNo', align: 'center',title: '鎻愬崌鏈哄彿'}
+ ,{field: 'crnStn$', align: 'center',title: '绔欑偣'}
,{field: 'memo', align: 'center',title: '澶囨敞'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true}
--
Gitblit v1.9.1