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

---
 Dto/HStation.Dto.PBS.Core/HStation.Dto.PBS.Core.csproj |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dto/HStation.Dto.PBS.Core/HStation.Dto.PBS.Core.csproj b/Dto/HStation.Dto.PBS.Core/HStation.Dto.PBS.Core.csproj
index d20ba41..4de0666 100644
--- a/Dto/HStation.Dto.PBS.Core/HStation.Dto.PBS.Core.csproj
+++ b/Dto/HStation.Dto.PBS.Core/HStation.Dto.PBS.Core.csproj
@@ -13,9 +13,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <Folder Include="01-place-build\" />
-	  <Folder Include="02-place-facility\" />
-	  <Folder Include="03-place-region\" />
+	  <Folder Include="01-place\" />
+	  <Folder Include="02-facility\" />
+	  <Folder Include="03-model-template\" />
 	</ItemGroup>
 
 </Project>

--
Gitblit v1.9.3