From e34c002fefc989c22c69918319a55394e72e50d3 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 22 十二月 2023 09:58:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion

---
 src/main/webapp/static/js/waitPakinLog/waitPakinLog.js |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
index 9094121..274d542 100644
--- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
+++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -5,7 +5,6 @@
     cols.push.apply(cols, detlCols);
     cols.push(
         {field: 'createBy$', align: 'center',title: '鎿嶄綔浜�', minWidth: 160, width: 160}
-        ,{field: 'userName$', align: 'center',title: '鎿嶄綔浜�'}
         ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
         ,{field: 'status', align: 'center',title: '鏁版嵁鐘舵��', templet:function(row){
                 var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='姝ｅ父|閿佸畾' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'";

--
Gitblit v1.9.1