From fa3e00c4d5e91613e3f2a1f2692cb68635d4ad2d Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 22 七月 2025 08:31:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/webapp/static/js/report/workOut.js | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/webapp/static/js/report/workOut.js b/src/main/webapp/static/js/report/workOut.js
index c8b06bf..7bffef6 100644
--- a/src/main/webapp/static/js/report/workOut.js
+++ b/src/main/webapp/static/js/report/workOut.js
@@ -6,7 +6,7 @@
,{field: 'crn_str_time', align: 'center',title: '鍫嗗灈鏈哄惎鍔ㄦ椂闂�'}
,{field: 'crn_end_time', align: 'center',title: '鍫嗗灈鏈哄仠姝㈡椂闂�'}
];
- cols.push.apply(cols, detlCols);
+ cols.push.apply(cols, detlCols2);
return cols;
}
--
Gitblit v1.9.1