From a468bd6b4866e7d02df525e7cb077a3753438905 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 18 十一月 2024 23:16:46 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp
index 695c6bf..7d49ef7 100644
--- a/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp
@@ -437,7 +437,7 @@
else continue;
KXMLDOMElement colename = e.selectSingleNode(L"//row[@rowindex='5']/cell[@colindex='" + colindex + L"']");
//查询列
- string searchcolumn = searchcol(colename);
+ xstring searchcolumn = searchcol(colename);
if (searchcolumn == L"否") continue;
//英文名
string ename = colename.selectSingleNode(L"@column").text();
@@ -524,7 +524,7 @@
//alert("ex");
int h = dw_col.GetCurSel();
if (h < 0) return L"";
- string str = (string)dw_col.GetItemData(h);
+ xstring str = (string)dw_col.GetItemData(h);
KXMLDOMDocument x;
if (x.loadXML(str))
{
--
Gitblit v1.9.3