From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Organize.Core/HStation.WinFrmUI.Organize.Core.csproj | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Organize.Core/HStation.WinFrmUI.Organize.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Organize.Core/HStation.WinFrmUI.Organize.Core.csproj
index 8d524da..b80cf7b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Organize.Core/HStation.WinFrmUI.Organize.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Organize.Core/HStation.WinFrmUI.Organize.Core.csproj
@@ -7,6 +7,33 @@
</PropertyGroup>
<ItemGroup>
+ <Compile Remove="00-UserControl\**" />
+ <Compile Remove="01-EmployeeViewModel\**" />
+ <Compile Remove="01-menu\**" />
+ <Compile Remove="02-Employee\**" />
+ <Compile Remove="05-AccessLog\**" />
+ <Compile Remove="06-MyCenter\**" />
+ <EmbeddedResource Remove="00-UserControl\**" />
+ <EmbeddedResource Remove="01-EmployeeViewModel\**" />
+ <EmbeddedResource Remove="01-menu\**" />
+ <EmbeddedResource Remove="02-Employee\**" />
+ <EmbeddedResource Remove="05-AccessLog\**" />
+ <EmbeddedResource Remove="06-MyCenter\**" />
+ <None Remove="00-UserControl\**" />
+ <None Remove="01-EmployeeViewModel\**" />
+ <None Remove="01-menu\**" />
+ <None Remove="02-Employee\**" />
+ <None Remove="05-AccessLog\**" />
+ <None Remove="06-MyCenter\**" />
+ <Page Remove="00-UserControl\**" />
+ <Page Remove="01-EmployeeViewModel\**" />
+ <Page Remove="01-menu\**" />
+ <Page Remove="02-Employee\**" />
+ <Page Remove="05-AccessLog\**" />
+ <Page Remove="06-MyCenter\**" />
+ </ItemGroup>
+
+ <ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
</ItemGroup>
--
Gitblit v1.9.3