From 9ee7d3bd9c58a204b1efe38e6be61155bbb15c16 Mon Sep 17 00:00:00 2001
From: chr <chr@chr.com>
Date: 星期三, 21 八月 2024 19:16:22 +0800
Subject: [PATCH] Merge branch 'master' of http://10.10.28.13:8080/r/PDM/PdmSwPlugin2
---
PdmSwPlugin.DrawApprove/PdmSwPlugin.DrawApprove.csproj | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/PdmSwPlugin.DrawApprove/PdmSwPlugin.DrawApprove.csproj b/PdmSwPlugin.DrawApprove/PdmSwPlugin.DrawApprove.csproj
index 0d54f78..3faa0ea 100644
--- a/PdmSwPlugin.DrawApprove/PdmSwPlugin.DrawApprove.csproj
+++ b/PdmSwPlugin.DrawApprove/PdmSwPlugin.DrawApprove.csproj
@@ -81,6 +81,9 @@
<Reference Include="PresentationFramework" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="DrawAuditHisControl.xaml.cs">
+ <DependentUpon>DrawAuditHisControl.xaml</DependentUpon>
+ </Compile>
<Compile Include="RejectWindow.xaml.cs">
<DependentUpon>RejectWindow.xaml</DependentUpon>
</Compile>
@@ -93,6 +96,10 @@
<Compile Include="XamlWindow.xaml.cs">
<DependentUpon>XamlWindow.xaml</DependentUpon>
</Compile>
+ <Page Include="DrawAuditHisControl.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
<Page Include="DrawApprove.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
@@ -142,13 +149,13 @@
</None>
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\CustomRictBox\PdmSwPlugin.UI.csproj">
+ <Project>{44bce7b9-f984-426b-9997-fc1fb1a49cc0}</Project>
+ <Name>PdmSwPlugin.UI</Name>
+ </ProjectReference>
<ProjectReference Include="..\PdmSwPlugin.Common\PdmSwPlugin.Common.csproj">
<Project>{e17ef6b6-ee83-45aa-b0c0-e3a097089e97}</Project>
<Name>PdmSwPlugin.Common</Name>
- </ProjectReference>
- <ProjectReference Include="Z:\VisualStudio\CustomRichBox\CustomRictBox\PdmSwPlugin.UI.csproj">
- <Project>{44bce7b9-f984-426b-9997-fc1fb1a49cc0}</Project>
- <Name>PdmSwPlugin.UI</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
--
Gitblit v1.9.1