From c93629be9b5bef0ebeadf26bff2c3730467a68d5 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期二, 02 七月 2024 15:45:43 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/GDN/GDNSourcePaperCard.cpp |    0 
 jrj/project/business/HR/ManpowerFile.cpp        |    4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jrj/project/business/GDN/GDNSourcePaperCard.cpp b/jrj/project/business/GDN/GDNSourcePaperCard.cpp
index 8c9b3b3..8399df6 100644
--- a/jrj/project/business/GDN/GDNSourcePaperCard.cpp
+++ b/jrj/project/business/GDN/GDNSourcePaperCard.cpp
Binary files differ
diff --git a/jrj/project/business/HR/ManpowerFile.cpp b/jrj/project/business/HR/ManpowerFile.cpp
index 123d75c..a661607 100644
--- a/jrj/project/business/HR/ManpowerFile.cpp
+++ b/jrj/project/business/HR/ManpowerFile.cpp
@@ -180,8 +180,8 @@
 			
 			arg.AddArg(L"html", str);
 			int obj = cast(dw_list as int);
-			arg.AddArg(L"obj", obj.toString());
-			OpenWindow(L"dev:xpage[data.vanalysis.vx]", cast(arg as int));
+			arg.AddArg(L"obj", xstring(obj));
+			OpenWindow(L"dev:xpage[data.vanalysis.vx]", arg);
 			xutil::RestoreCursor(hCursor);
 			return 1;
 		}

--
Gitblit v1.9.3