Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

xj qian

2025-01-10 ea146e50321c44fe775b557b24d8443075107185

 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();