From 9ac9cc9e9cd91b97d35a6e28400df71630765e40 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 21 八月 2024 14:35:51 +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, 2 insertions(+), 2 deletions(-)

diff --git a/jrj/project/business/AR/ExchageInput3.cpp b/jrj/project/business/AR/ExchageInput3.cpp
index 89408ad..2520729 100644
--- a/jrj/project/business/AR/ExchageInput3.cpp
+++ b/jrj/project/business/AR/ExchageInput3.cpp
@@ -306,7 +306,7 @@
 				}
 				if (frow > dw_list.GetRowCount()) return 1;
 				dw_list.SetRow(frow);
-				OpenWindow(L"dev:xpage[ExchangeSignFast.vx]", (WPARAM)&dw_list);
+				OpenWindow(L"dev:xpage[ExchangeSignFast.vx]", (LPARAM)dw_list.getNativePointer());
 				return 1;
 			}
 			else if (comdid == L"xmAdd")
@@ -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();

--
Gitblit v1.9.3