From cb55b0e814bd30b3b3d1842b61898ae6916f83ed Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 19 七月 2024 13:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/PO/PO.maint.item.line.cpp | 0
jrj/project/business/Public/GroupManagerList.cpp | 2 +-
jrj/ext-jrj/ext-jrj.vcxproj | 1 +
jrj/project/business/Public/message.business.cpp | 0
4 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index b8f84ab..8616db5 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -677,6 +677,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
+ <ClCompile Include="..\project\business\PO\PO.maint.item.line.cpp" />
<ClCompile Include="..\project\business\Product.list.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
diff --git a/jrj/project/business/PO/PO.maint.item.line.cpp b/jrj/project/business/PO/PO.maint.item.line.cpp
new file mode 100644
index 0000000..123d54e
--- /dev/null
+++ b/jrj/project/business/PO/PO.maint.item.line.cpp
Binary files differ
diff --git a/jrj/project/business/Public/GroupManagerList.cpp b/jrj/project/business/Public/GroupManagerList.cpp
index 8b5c127..1f59048 100644
--- a/jrj/project/business/Public/GroupManagerList.cpp
+++ b/jrj/project/business/Public/GroupManagerList.cpp
@@ -95,7 +95,7 @@
{
KXMLDOMElement e = nlist.item(i);
xstring name = e.selectSingleNode(L"@name").text();
- HTREEITEM h = tv_folder.InsertChildItem( 0, name, name, e, 15);
+ HTREEITEM h = tv_folder.InsertChildItem(0, name, name, e, 15);
createSubTree(h, e);
tv_folder.ExpandItem(h);
}
diff --git a/jrj/project/business/Public/message.business.cpp b/jrj/project/business/Public/message.business.cpp
index 600ce70..092ebc6 100644
--- a/jrj/project/business/Public/message.business.cpp
+++ b/jrj/project/business/Public/message.business.cpp
Binary files differ
--
Gitblit v1.9.3