From 450912c14ede3f1d45211833ab862ab6f1259107 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 26 七月 2024 09:28:55 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/AR/ExchageInput3.cpp | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/jrj/project/business/AR/ExchageInput3.cpp b/jrj/project/business/AR/ExchageInput3.cpp
index 02f0db0..ab505d1 100644
--- a/jrj/project/business/AR/ExchageInput3.cpp
+++ b/jrj/project/business/AR/ExchageInput3.cpp
@@ -360,7 +360,7 @@
int h = xcombobox::GetCurSel(evt->command.hCtrl);
if (h > -1)
{
- tabname = xcombobox::GetItemData(evt->command.hCtrl, h);
+ tabname = (string)xcombobox::GetItemData(evt->command.hCtrl, h);
SwitchLayer(L"sheet" + xstring(h + 1), L"frame");
RetrieveData();
SetAgent();
@@ -426,8 +426,6 @@
xml x;
xaserverarg arg ;
-
- arg.setNativePointer(arg.CreateInstance());
arg.AddArg(L"QueryTxt", xcontrol(GetControl(L"sle_search")).GetText());
arg.AddArg(L"QueryArg", GetQueryArg());
//trace(L"QueryArg======L"+GetQueryArg());
--
Gitblit v1.9.3