From 76c2f8801aa96f711d4a2099c8f356174474ed4a Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 17 七月 2024 20:56:32 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/SystemSettings/UserImport.cpp |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jrj/project/business/SystemSettings/UserImport.cpp b/jrj/project/business/SystemSettings/UserImport.cpp
index 0ef3160..809ca0f 100644
--- a/jrj/project/business/SystemSettings/UserImport.cpp
+++ b/jrj/project/business/SystemSettings/UserImport.cpp
@@ -6,7 +6,8 @@
 
 #include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
 #include "viewobject/view.base.hpp"
-//use "dev:code[SysUser.vx]"
+
+#include "SysUser.hpp"
 
 using xml = KXMLDOMDocument;
 class __declspec(dllexport) UserImport : public xframe
@@ -327,7 +328,7 @@
 		OnInitial();
 		OnCreateTree(L"00000000-0000-0000-0000-000000000000", 0);
 		//int wid = tv_org.GetId();
-		int root = tv_org.GetRootItem();
+		HTREEITEM root = tv_org.GetRootItem();
 		tv_org.ExpandItem(root);
 		OnRetrieve(L"00000000-0000-0000-0000-000000000000");
 		return 1;

--
Gitblit v1.9.3