From a36faf95b4bee06626f33a82448f93e364b29ec5 Mon Sep 17 00:00:00 2001
From: tangxu <76880903@qq.com>
Date: 星期六, 08 十月 2022 10:55:01 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1
---
IStation.WebApi.sln | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/IStation.WebApi.sln b/IStation.WebApi.sln
index 9ab32bd..4d16a16 100644
--- a/IStation.WebApi.sln
+++ b/IStation.WebApi.sln
@@ -257,6 +257,8 @@
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("{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
Debug|Any CPU = Debug|Any CPU
@@ -723,6 +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
+ {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
@@ -842,6 +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}
+ {E7D995AB-A446-4838-8681-DEC5E2EDB962} = {B1548C2C-C3C2-47C0-8F6E-B265D0603099}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {18D1EA07-81E5-4443-8512-F303BC79DCF4}
--
Gitblit v1.9.3