From 31a803602d5320269f2269ed0e036c8119c232b5 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 07 十一月 2024 13:54:24 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/SystemSettings/Data.config.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jrj/project/business/SystemSettings/Data.config.cpp b/jrj/project/business/SystemSettings/Data.config.cpp
index 5bda1df..4a3fe1d 100644
--- a/jrj/project/business/SystemSettings/Data.config.cpp
+++ b/jrj/project/business/SystemSettings/Data.config.cpp
@@ -98,7 +98,7 @@
 			return -1;
 		}
 
-		if (x.xml() == L"")
+		if ((xstring)x.xml() == L"")
 			x.loadXML(L"<root><items/><roles/></root>");
 
 		xml x1;
@@ -494,7 +494,7 @@
 			return -1;
 		}
 
-		if (x.xml() == L"")
+		if ((xstring)x.xml() == L"")
 			x.loadXML(L"<root><items/><roles/></root>");
 
 		KXMLDOMElement e = x.documentElement();

--
Gitblit v1.9.3