From abc00124a405f68609416eac5124971ef56fd566 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 18 九月 2024 11:56:54 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp | 4 ++--
jrj/project/business/GDN/list.SOTrace3.cpp | 0
jrj/project/business/SO3.list.cpp | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/jrj/project/business/GDN/list.SOTrace3.cpp b/jrj/project/business/GDN/list.SOTrace3.cpp
index 27e5226..fd00fae 100644
--- a/jrj/project/business/GDN/list.SOTrace3.cpp
+++ b/jrj/project/business/GDN/list.SOTrace3.cpp
Binary files differ
diff --git a/jrj/project/business/SO3.list.cpp b/jrj/project/business/SO3.list.cpp
index f9a8259..b4a4a97 100644
--- a/jrj/project/business/SO3.list.cpp
+++ b/jrj/project/business/SO3.list.cpp
@@ -134,8 +134,8 @@
int row = dw_list.GetRow();
if (row < 1) return 1;
KXMLDOMElement ele = dw_list.GetRowElement(row);
- string id = GetEntityIDName(1);
- string entity = ele.selectSingleNode(id).text();
+ xstring id = GetEntityIDName(1);
+ xstring entity = ele.selectSingleNode(id).text();
//trace(entity);
SetAgent(L"list", entity);
if (arg.GetArgString(L"state") != L"")
diff --git a/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
index 7c9532b..9f7ec17 100644
--- a/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/listwin.vframe.vbusiness.hpp
@@ -286,8 +286,8 @@
else
{
KXMLDOMElement ele = dw_list.GetRowElement(row);
- string id = GetEntityIDName(1);
- string entity = ele.selectSingleNode(id).text();
+ xstring id = GetEntityIDName(1);
+ xstring entity = ele.selectSingleNode(id).text();
//alert(ele.xml);
SetAgent(L"list", entity);
}
--
Gitblit v1.9.3