From 9786b6898c79f5de9ca7eeb168fe4b6f5b0d173f Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 06 九月 2024 13:52:39 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/viewobject/view.base.hpp |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jrj/project/viewobject/view.base.hpp b/jrj/project/viewobject/view.base.hpp
index 262f212..3a919ec 100644
--- a/jrj/project/viewobject/view.base.hpp
+++ b/jrj/project/viewobject/view.base.hpp
@@ -41,7 +41,7 @@
 		return arg;
 	}
 
-	static string GetGuid()
+	static xstring GetGuid()
 	{
 		return publiccode::GetGuid();
 	}
@@ -138,9 +138,10 @@
 	}
 	static KXMLDOMDocument RetrieveData(string queryUrl, string argName, string argValue, string argName1, string argValue1, string argName2, string argValue2, string argName3, string argValue3)
 	{
-		return RetrieveData(xapp::GetServerUrl(), queryUrl, argName, argValue, argName1, argValue1, argName2, argValue3, argName2, argValue3);
+		return RetrieveData(xapp::GetServerUrl(), queryUrl, argName, argValue, argName1, argValue1, argName2, argValue2, argName3, argValue3); 
 	}
 
+
 	static KXMLDOMDocument RetrieveData(string serverUrl, string queryUrl, string argName, string argValue, string argName1, string argValue1, string argName2, string argValue2, string argName3, string argValue3)
 	{
 		KXMLDOMDocument x;

--
Gitblit v1.9.3