From c653f2f6f2de553395b706de3a62fec5e4a6fbf7 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 21 十一月 2024 17:52:18 +0800
Subject: [PATCH] 冲突

---
 WinFrmUI/HStation.WinFrmUI.PBS.Core/HStation.WinFrmUI.PBS.Core.csproj.user |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.PBS.Core/HStation.WinFrmUI.PBS.Core.csproj.user b/WinFrmUI/HStation.WinFrmUI.PBS.Core/HStation.WinFrmUI.PBS.Core.csproj.user
index b5309f2..16ab16e 100644
--- a/WinFrmUI/HStation.WinFrmUI.PBS.Core/HStation.WinFrmUI.PBS.Core.csproj.user
+++ b/WinFrmUI/HStation.WinFrmUI.PBS.Core/HStation.WinFrmUI.PBS.Core.csproj.user
@@ -1,5 +1,9 @@
 锘�<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup />
-  <ItemGroup />
+  <ItemGroup>
+    <Compile Update="01-place\PlaceMgrPage.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+  </ItemGroup>
 </Project>
\ No newline at end of file

--
Gitblit v1.9.3