From 2be5d90e96f163c67101571f6865b17effcb0f3f Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 12 四月 2023 13:26:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/IStation/Service.V4.1

---
 IStation.WebApi.LinuxTest.sln |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/IStation.WebApi.LinuxTest.sln b/IStation.WebApi.LinuxTest.sln
index b248f1c..f53802d 100644
--- a/IStation.WebApi.LinuxTest.sln
+++ b/IStation.WebApi.LinuxTest.sln
@@ -87,6 +87,8 @@
 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
@@ -221,6 +223,10 @@
 		{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
@@ -257,6 +263,7 @@
 		{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