From fd991e354648eacbf449b4b3fceafedfbaa4201f Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期一, 09 三月 2026 11:03:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI.sln | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/WebAPI.sln b/WebAPI.sln
index 7fc0032..0fc3699 100644
--- a/WebAPI.sln
+++ b/WebAPI.sln
@@ -3,12 +3,6 @@
# Visual Studio Version 16
VisualStudioVersion = 16.0.30907.101
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebAPI", "WebAPI\WebAPI.csproj", "{5B60CE0C-963C-4DC2-91B3-0B471AAC5438}"
- ProjectSection(ProjectDependencies) = postProject
- {0844CD97-FFAB-445F-A473-1380387E9A12} = {0844CD97-FFAB-445F-A473-1380387E9A12}
- {59DA489D-C83F-4584-8F1E-0BE1DC9710D4} = {59DA489D-C83F-4584-8F1E-0BE1DC9710D4}
- EndProjectSection
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "APSM", "APSM\APSM.csproj", "{59DA489D-C83F-4584-8F1E-0BE1DC9710D4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaseSet", "BaseSet\BaseSet.csproj", "{0844CD97-FFAB-445F-A473-1380387E9A12}"
@@ -57,6 +51,8 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SyntacticSugar", "SyntacticSugar\SyntacticSugar.csproj", "{AFD44036-A391-4A68-BD73-37BABFC1605E}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebAPI", "WebAPI\WebAPI.csproj", "{5B60CE0C-963C-4DC2-91B3-0B471AAC5438}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -65,13 +61,6 @@
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Debug|x86.ActiveCfg = Debug|x86
- {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Debug|x86.Build.0 = Debug|x86
- {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Release|Any CPU.Build.0 = Release|Any CPU
- {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Release|x86.ActiveCfg = Release|Any CPU
{59DA489D-C83F-4584-8F1E-0BE1DC9710D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{59DA489D-C83F-4584-8F1E-0BE1DC9710D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{59DA489D-C83F-4584-8F1E-0BE1DC9710D4}.Debug|x86.ActiveCfg = Debug|x86
@@ -264,6 +253,14 @@
{AFD44036-A391-4A68-BD73-37BABFC1605E}.Release|Any CPU.Build.0 = Release|Any CPU
{AFD44036-A391-4A68-BD73-37BABFC1605E}.Release|x86.ActiveCfg = Release|Any CPU
{AFD44036-A391-4A68-BD73-37BABFC1605E}.Release|x86.Build.0 = Release|Any CPU
+ {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Debug|x86.ActiveCfg = Debug|x86
+ {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Debug|x86.Build.0 = Debug|x86
+ {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Release|Any CPU.Build.0 = Release|Any CPU
+ {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Release|x86.ActiveCfg = Release|x86
+ {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
--
Gitblit v1.9.1