From 2bc7800e9f02fed6652f6b0defe1d978f186e914 Mon Sep 17 00:00:00 2001
From: yangyin <1850366751@qq.com>
Date: 星期一, 12 八月 2024 09:18:34 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Organize.Core/HStation.WinFrmUI.Organize.Core.csproj.user | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Organize.Core/HStation.WinFrmUI.Organize.Core.csproj.user b/WinFrmUI/HStation.WinFrmUI.Organize.Core/HStation.WinFrmUI.Organize.Core.csproj.user
index 2b34bbb..e0dc690 100644
--- a/WinFrmUI/HStation.WinFrmUI.Organize.Core/HStation.WinFrmUI.Organize.Core.csproj.user
+++ b/WinFrmUI/HStation.WinFrmUI.Organize.Core/HStation.WinFrmUI.Organize.Core.csproj.user
@@ -5,10 +5,10 @@
<Compile Update="00-UserControl\InterfationFrom.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="00-UserControl\EmloyeeFrom.cs">
+ <Compile Update="00-UserControl\EmloyeeInfoCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="00-UserControl\LoginUserForm.cs">
+ <Compile Update="00-UserControl\LoginUserInfoCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="02-Employee\AddEmployeeDlg.cs">
--
Gitblit v1.9.3