From 14801a2e40bc79833c41151a37fe4cb0acbc5c7f Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 三月 2023 10:32:25 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1
---
IStation.WebApi.LinuxTest.sln | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/IStation.WebApi.LinuxTest.sln b/IStation.WebApi.LinuxTest.sln
index 8683e83..f53802d 100644
--- a/IStation.WebApi.LinuxTest.sln
+++ b/IStation.WebApi.LinuxTest.sln
@@ -79,6 +79,16 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Model.LinuxTest", "Model\IStation.Model.LinuxTest\IStation.Model.LinuxTest.csproj", "{04BD98BE-103D-492B-B04D-4AF7BF9EDC9C}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Entity", "Entity", "{33C0C5EA-B36C-4F0C-B726-E45957843DEB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Entity", "Entity\IStation.Entity\IStation.Entity.csproj", "{26FC56FE-10EA-40F9-9033-CA42C85E4E3F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Entity.Core", "Entity\IStation.Entity.Core\IStation.Entity.Core.csproj", "{A2B8ACA2-542B-4C6E-896F-7B12A9EC8EC8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.DAL.LinuxTest", "DAL\IStation.DAL.LinuxTest\IStation.DAL.LinuxTest.csproj", "{340F098C-CA79-4B10-BEC0-E05C7EB8DCBB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IStation.Entity.LinuxTest", "Entity\IStation.Entity.LinuxTest\IStation.Entity.LinuxTest.csproj", "{1D07F657-8318-4190-85CF-402216422EE1}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -201,6 +211,22 @@
{04BD98BE-103D-492B-B04D-4AF7BF9EDC9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{04BD98BE-103D-492B-B04D-4AF7BF9EDC9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{04BD98BE-103D-492B-B04D-4AF7BF9EDC9C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {26FC56FE-10EA-40F9-9033-CA42C85E4E3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {26FC56FE-10EA-40F9-9033-CA42C85E4E3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {26FC56FE-10EA-40F9-9033-CA42C85E4E3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {26FC56FE-10EA-40F9-9033-CA42C85E4E3F}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A2B8ACA2-542B-4C6E-896F-7B12A9EC8EC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A2B8ACA2-542B-4C6E-896F-7B12A9EC8EC8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A2B8ACA2-542B-4C6E-896F-7B12A9EC8EC8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A2B8ACA2-542B-4C6E-896F-7B12A9EC8EC8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {340F098C-CA79-4B10-BEC0-E05C7EB8DCBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {340F098C-CA79-4B10-BEC0-E05C7EB8DCBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {340F098C-CA79-4B10-BEC0-E05C7EB8DCBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {340F098C-CA79-4B10-BEC0-E05C7EB8DCBB}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1D07F657-8318-4190-85CF-402216422EE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1D07F657-8318-4190-85CF-402216422EE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1D07F657-8318-4190-85CF-402216422EE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1D07F657-8318-4190-85CF-402216422EE1}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -234,6 +260,10 @@
{EF182F21-FD0A-4B4D-8A9D-E03B907E19E9} = {318306D9-A6F4-456C-9019-8E7EDA4F2066}
{FD42C066-D190-4433-8220-1FE16E82F6A6} = {C7614DA2-0679-407D-B9E3-66D448DD7488}
{04BD98BE-103D-492B-B04D-4AF7BF9EDC9C} = {61C58B21-80C9-4092-ACC5-141B424D15E8}
+ {26FC56FE-10EA-40F9-9033-CA42C85E4E3F} = {33C0C5EA-B36C-4F0C-B726-E45957843DEB}
+ {A2B8ACA2-542B-4C6E-896F-7B12A9EC8EC8} = {33C0C5EA-B36C-4F0C-B726-E45957843DEB}
+ {340F098C-CA79-4B10-BEC0-E05C7EB8DCBB} = {49E7CA43-7FD9-48A3-B0DB-6D99FA93F393}
+ {1D07F657-8318-4190-85CF-402216422EE1} = {33C0C5EA-B36C-4F0C-B726-E45957843DEB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {18D1EA07-81E5-4443-8512-F303BC79DCF4}
--
Gitblit v1.9.3