From 3fec42c6383aa3b8d65f744a93b8a918d7cc6e02 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 23 七月 2024 10:15:54 +0800
Subject: [PATCH] 冲突
---
HStation.Xhs.Desktop.sln | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/HStation.Xhs.Desktop.sln b/HStation.Xhs.Desktop.sln
index e6b384a..c2b284b 100644
--- a/HStation.Xhs.Desktop.sln
+++ b/HStation.Xhs.Desktop.sln
@@ -75,13 +75,19 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yw.WinFrmUI.Bimface.Core", "WinFrmUI\Yw.WinFrmUI.Bimface.Core\Yw.WinFrmUI.Bimface.Core.csproj", "{787B8F00-E79A-43DA-AA6F-1C9FB2207F24}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HStation.Service.Organize.Core", "HStation.Service.Organize.Core\HStation.Service.Organize.Core.csproj", "{2312F54F-1781-46DA-BD53-9432DA4C2E08}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Service.Organize.Core", "HStation.Service.Organize.Core\HStation.Service.Organize.Core.csproj", "{2312F54F-1781-46DA-BD53-9432DA4C2E08}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HStation.Dto.Organize.Core", "HStation.Dto.Organize.Core\HStation.Dto.Organize.Core.csproj", "{411EEAA2-6AB7-4ECA-92FE-A077322B492C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Dto.Organize.Core", "HStation.Dto.Organize.Core\HStation.Dto.Organize.Core.csproj", "{411EEAA2-6AB7-4ECA-92FE-A077322B492C}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HStation.BLL.Organize.Core", "HStation.BLL.Organize.Core\HStation.BLL.Organize.Core.csproj", "{1D4081CB-6CDE-4522-8B3A-E4D1ED894780}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.BLL.Organize.Core", "HStation.BLL.Organize.Core\HStation.BLL.Organize.Core.csproj", "{1D4081CB-6CDE-4522-8B3A-E4D1ED894780}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HStation.WinFrmUI.Organize.Core", "HStation.WinFrmUI.Organize.Core\HStation.WinFrmUI.Organize.Core.csproj", "{148F4F07-4D10-4B86-99DA-3682E5D5FA49}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.WinFrmUI.Organize.Core", "HStation.WinFrmUI.Organize.Core\HStation.WinFrmUI.Organize.Core.csproj", "{148F4F07-4D10-4B86-99DA-3682E5D5FA49}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.BLL.Phart.Core", "BLL\HStation.BLL.Phart.Core\HStation.BLL.Phart.Core.csproj", "{4F35FB8F-2707-4CE6-B3AC-1CBDBDA4B9F6}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Dto.Phart.Core", "Dto\HStation.Dto.Phart.Core\HStation.Dto.Phart.Core.csproj", "{4BB30BA4-F5A1-4C3E-84F1-6C96095C2741}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Service.Phart.Core", "Service\HStation.Service.Phart.Core\HStation.Service.Phart.Core.csproj", "{758B0348-6059-4EF6-9D63-7C5FCEC30D4D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -217,6 +223,18 @@
{148F4F07-4D10-4B86-99DA-3682E5D5FA49}.Debug|Any CPU.Build.0 = Debug|Any CPU
{148F4F07-4D10-4B86-99DA-3682E5D5FA49}.Release|Any CPU.ActiveCfg = Release|Any CPU
{148F4F07-4D10-4B86-99DA-3682E5D5FA49}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4F35FB8F-2707-4CE6-B3AC-1CBDBDA4B9F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4F35FB8F-2707-4CE6-B3AC-1CBDBDA4B9F6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4F35FB8F-2707-4CE6-B3AC-1CBDBDA4B9F6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4F35FB8F-2707-4CE6-B3AC-1CBDBDA4B9F6}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4BB30BA4-F5A1-4C3E-84F1-6C96095C2741}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4BB30BA4-F5A1-4C3E-84F1-6C96095C2741}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4BB30BA4-F5A1-4C3E-84F1-6C96095C2741}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4BB30BA4-F5A1-4C3E-84F1-6C96095C2741}.Release|Any CPU.Build.0 = Release|Any CPU
+ {758B0348-6059-4EF6-9D63-7C5FCEC30D4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {758B0348-6059-4EF6-9D63-7C5FCEC30D4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {758B0348-6059-4EF6-9D63-7C5FCEC30D4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {758B0348-6059-4EF6-9D63-7C5FCEC30D4D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -253,6 +271,9 @@
{411EEAA2-6AB7-4ECA-92FE-A077322B492C} = {60068812-89D4-4DAB-A41B-0334B8D76A0B}
{1D4081CB-6CDE-4522-8B3A-E4D1ED894780} = {6FA135ED-89EF-474B-B502-FEA300F613A5}
{148F4F07-4D10-4B86-99DA-3682E5D5FA49} = {D5B088B2-E69E-4B43-838B-080B9F012077}
+ {4F35FB8F-2707-4CE6-B3AC-1CBDBDA4B9F6} = {6FA135ED-89EF-474B-B502-FEA300F613A5}
+ {4BB30BA4-F5A1-4C3E-84F1-6C96095C2741} = {60068812-89D4-4DAB-A41B-0334B8D76A0B}
+ {758B0348-6059-4EF6-9D63-7C5FCEC30D4D} = {67608112-BE07-493C-8240-E084CF461482}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E02989A8-9B6F-43E5-AACA-790328215089}
--
Gitblit v1.9.3