From b6c698c8833836971184a0a9c2645a15f8174d37 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 08 五月 2025 16:31:18 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/datasource/verifycard/index.jsx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index 58eef7d..72c8e18 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -730,7 +730,7 @@
if ((setting.interType === 'system' && setting.execute !== 'false') || _scripts.length > 0) {
let _columns = columns
- if (config.subtype === 'dualdatacard') {
+ if (config.subtype === 'dualdatacard' && setting.subdata !== 'sub_data_string') {
_columns = [...columns, ...subColumns]
}
@@ -1117,7 +1117,7 @@
drop table #${setting.tableName || 'tb'}${extend}
- select top 99999 @mk_total as mk_total * from #${setting.tableName || 'tb'} order by sort_id`
+ select top 99999 @mk_total as mk_total, * from #${setting.tableName || 'tb'} order by sort_id`
document.body.appendChild(oInput)
oInput.select()
--
Gitblit v1.8.0