From 2f30d9dfe474db862e1b409065a7ba5280bed92b Mon Sep 17 00:00:00 2001
From: tangxu <76880903@qq.com>
Date: 星期一, 31 十月 2022 14:18:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1
---
IStation.WebApi.sln | 37 ++++++-------------------------------
1 files changed, 6 insertions(+), 31 deletions(-)
diff --git a/IStation.WebApi.sln b/IStation.WebApi.sln
index ae347b8..4d16a16 100644
--- a/IStation.WebApi.sln
+++ b/IStation.WebApi.sln
@@ -257,17 +257,7 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Application.LargeScreen", "Application\IStation.Application.LargeScreen\IStation.Application.LargeScreen.csproj", "{902AABE5-E167-444E-B3C7-8077E1E9BBBB}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{B419D1AA-F88B-4780-9018-30D5669C48DC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IStation.Server.Problem", "Server\IStation.Server.Problem\IStation.Server.Problem.csproj", "{F3318A6B-C91E-467C-B34A-09EFCA2AB96D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Quartz", "Component\IStation.Quartz\IStation.Quartz.csproj", "{7E81C4F8-DB88-463D-B887-9D656F97B518}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TopShelf", "TopShelf", "{02FFB09B-F53B-4CE0-A5B7-85B1881DCD2A}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IStation.TopShelf.Problem", "TopShelf\IStation.TopShelf.Problem\IStation.TopShelf.Problem.csproj", "{61E3D597-E23F-48D9-BB82-E57C9C8F6F75}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.TopShelf", "Component\IStation.TopShelf\IStation.TopShelf.csproj", "{5F073459-68D0-4190-AAE7-DADDB85CFB85}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Calculation.Plan", "Calculation\IStation.Calculation.Plan\IStation.Calculation.Plan.csproj", "{E7D995AB-A446-4838-8681-DEC5E2EDB962}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -735,22 +725,10 @@
{902AABE5-E167-444E-B3C7-8077E1E9BBBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{902AABE5-E167-444E-B3C7-8077E1E9BBBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{902AABE5-E167-444E-B3C7-8077E1E9BBBB}.Release|Any CPU.Build.0 = Release|Any CPU
- {F3318A6B-C91E-467C-B34A-09EFCA2AB96D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {F3318A6B-C91E-467C-B34A-09EFCA2AB96D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {F3318A6B-C91E-467C-B34A-09EFCA2AB96D}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {F3318A6B-C91E-467C-B34A-09EFCA2AB96D}.Release|Any CPU.Build.0 = Release|Any CPU
- {7E81C4F8-DB88-463D-B887-9D656F97B518}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7E81C4F8-DB88-463D-B887-9D656F97B518}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7E81C4F8-DB88-463D-B887-9D656F97B518}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7E81C4F8-DB88-463D-B887-9D656F97B518}.Release|Any CPU.Build.0 = Release|Any CPU
- {61E3D597-E23F-48D9-BB82-E57C9C8F6F75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {61E3D597-E23F-48D9-BB82-E57C9C8F6F75}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {61E3D597-E23F-48D9-BB82-E57C9C8F6F75}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {61E3D597-E23F-48D9-BB82-E57C9C8F6F75}.Release|Any CPU.Build.0 = Release|Any CPU
- {5F073459-68D0-4190-AAE7-DADDB85CFB85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5F073459-68D0-4190-AAE7-DADDB85CFB85}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5F073459-68D0-4190-AAE7-DADDB85CFB85}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5F073459-68D0-4190-AAE7-DADDB85CFB85}.Release|Any CPU.Build.0 = Release|Any CPU
+ {E7D995AB-A446-4838-8681-DEC5E2EDB962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {E7D995AB-A446-4838-8681-DEC5E2EDB962}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {E7D995AB-A446-4838-8681-DEC5E2EDB962}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {E7D995AB-A446-4838-8681-DEC5E2EDB962}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -870,10 +848,7 @@
{6B1F2F73-E16C-4C85-9D3B-B1872E363653} = {C7614DA2-0679-407D-B9E3-66D448DD7488}
{73065108-246A-4852-A248-1755B3804DF5} = {C7614DA2-0679-407D-B9E3-66D448DD7488}
{902AABE5-E167-444E-B3C7-8077E1E9BBBB} = {C7614DA2-0679-407D-B9E3-66D448DD7488}
- {F3318A6B-C91E-467C-B34A-09EFCA2AB96D} = {B419D1AA-F88B-4780-9018-30D5669C48DC}
- {7E81C4F8-DB88-463D-B887-9D656F97B518} = {8999E5DD-B675-4FFB-AEE4-CC96FC483845}
- {61E3D597-E23F-48D9-BB82-E57C9C8F6F75} = {02FFB09B-F53B-4CE0-A5B7-85B1881DCD2A}
- {5F073459-68D0-4190-AAE7-DADDB85CFB85} = {8999E5DD-B675-4FFB-AEE4-CC96FC483845}
+ {E7D995AB-A446-4838-8681-DEC5E2EDB962} = {B1548C2C-C3C2-47C0-8F6E-B265D0603099}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {18D1EA07-81E5-4443-8512-F303BC79DCF4}
--
Gitblit v1.9.3