From c653f2f6f2de553395b706de3a62fec5e4a6fbf7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 21 十一月 2024 17:52:18 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/Yw.WinFrmUI.Core/Yw.WinFrmUI.Core.csproj | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Core/Yw.WinFrmUI.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Core/Yw.WinFrmUI.Core.csproj
index 1d92e77..707d123 100644
--- a/WinFrmUI/Yw.WinFrmUI.Core/Yw.WinFrmUI.Core.csproj
+++ b/WinFrmUI/Yw.WinFrmUI.Core/Yw.WinFrmUI.Core.csproj
@@ -36,6 +36,12 @@
<Compile Update="03-wait\WaitFormStyle.cs">
<SubType>Form</SubType>
</Compile>
+ <Compile Update="09-common\04-search-select\GeneralSearchAndSelectCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="09-common\05-search-set-select\GeneralSearchAndSelectCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="11-tree\01-simple\SimpleTreeViewCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
--
Gitblit v1.9.3