From 1cbc6c9bee7048d3546adebe87d96715630e7d59 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 16 八月 2022 18:21:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI.sln |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/WebAPI.sln b/WebAPI.sln
index 7aab1cc..0175483 100644
--- a/WebAPI.sln
+++ b/WebAPI.sln
@@ -47,6 +47,8 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NETERPNoWin", "NETERPNoWin\NETERPNoWin.csproj", "{6358F078-D26F-445A-8C8D-7BAE115F2326}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PayM", "PayM\PayM.csproj", "{36A0CF08-E176-4A58-B406-D187943804EE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -229,6 +231,14 @@
 		{6358F078-D26F-445A-8C8D-7BAE115F2326}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6358F078-D26F-445A-8C8D-7BAE115F2326}.Release|x86.ActiveCfg = Release|x86
 		{6358F078-D26F-445A-8C8D-7BAE115F2326}.Release|x86.Build.0 = Release|x86
+		{36A0CF08-E176-4A58-B406-D187943804EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36A0CF08-E176-4A58-B406-D187943804EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36A0CF08-E176-4A58-B406-D187943804EE}.Debug|x86.ActiveCfg = Debug|x86
+		{36A0CF08-E176-4A58-B406-D187943804EE}.Debug|x86.Build.0 = Debug|x86
+		{36A0CF08-E176-4A58-B406-D187943804EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36A0CF08-E176-4A58-B406-D187943804EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{36A0CF08-E176-4A58-B406-D187943804EE}.Release|x86.ActiveCfg = Release|x86
+		{36A0CF08-E176-4A58-B406-D187943804EE}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

--
Gitblit v1.9.1