From 098d529e0d74efd131ec2c70df59b84abb336da7 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期五, 29 七月 2022 08:28:36 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI.sln | 40 +++++++++++++++-------------------------
1 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/WebAPI.sln b/WebAPI.sln
index d31911a..7aab1cc 100644
--- a/WebAPI.sln
+++ b/WebAPI.sln
@@ -19,15 +19,11 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kanban", "Kanban\Kanban.csproj", "{264A20DB-903A-4B9F-84BD-CB34A11D7320}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KanbanBoard", "KanbanBoard\KanbanBoard.csproj", "{0C45CBA5-0FAD-4974-9314-A52DD63273C9}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LMES", "LMES\LMES.csproj", "{5728476C-79B5-4556-B925-FBC8720266F0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MES", "MES\MES.csproj", "{609A6A42-C190-4FA1-ADC4-15325F8AA06C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Model", "Model\Model.csproj", "{5061B703-B7A6-4E82-A9AA-F73FD80520BF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MoveForm", "MoveForm\MoveForm.csproj", "{774D64C8-D36D-4841-8D26-3341EA7D8B4C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OAM", "OAM\OAM.csproj", "{0ABFE354-E66C-4643-9D77-3B84B13F0485}"
EndProject
@@ -49,6 +45,8 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkM", "WorkM\WorkM.csproj", "{38499782-D273-45EE-A5A4-19AC1FC36444}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NETERPNoWin", "NETERPNoWin\NETERPNoWin.csproj", "{6358F078-D26F-445A-8C8D-7BAE115F2326}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -59,7 +57,7 @@
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Debug|x86.ActiveCfg = Debug|x86
{5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Release|Any CPU.Build.0 = Release|Any CPU
{5B60CE0C-963C-4DC2-91B3-0B471AAC5438}.Release|x86.ActiveCfg = Release|Any CPU
@@ -105,28 +103,20 @@
{F2098F1B-4FA1-49BB-91EA-AB3522008F28}.Release|x86.Build.0 = Release|x86
{952A5CF5-EC40-40F7-8346-EEA840DFE2D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{952A5CF5-EC40-40F7-8346-EEA840DFE2D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {952A5CF5-EC40-40F7-8346-EEA840DFE2D7}.Debug|x86.ActiveCfg = Debug|Any CPU
- {952A5CF5-EC40-40F7-8346-EEA840DFE2D7}.Debug|x86.Build.0 = Debug|Any CPU
+ {952A5CF5-EC40-40F7-8346-EEA840DFE2D7}.Debug|x86.ActiveCfg = Debug|x86
+ {952A5CF5-EC40-40F7-8346-EEA840DFE2D7}.Debug|x86.Build.0 = Debug|x86
{952A5CF5-EC40-40F7-8346-EEA840DFE2D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{952A5CF5-EC40-40F7-8346-EEA840DFE2D7}.Release|Any CPU.Build.0 = Release|Any CPU
{952A5CF5-EC40-40F7-8346-EEA840DFE2D7}.Release|x86.ActiveCfg = Release|Any CPU
{952A5CF5-EC40-40F7-8346-EEA840DFE2D7}.Release|x86.Build.0 = Release|Any CPU
{264A20DB-903A-4B9F-84BD-CB34A11D7320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{264A20DB-903A-4B9F-84BD-CB34A11D7320}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {264A20DB-903A-4B9F-84BD-CB34A11D7320}.Debug|x86.ActiveCfg = Debug|Any CPU
- {264A20DB-903A-4B9F-84BD-CB34A11D7320}.Debug|x86.Build.0 = Debug|Any CPU
+ {264A20DB-903A-4B9F-84BD-CB34A11D7320}.Debug|x86.ActiveCfg = Debug|x86
+ {264A20DB-903A-4B9F-84BD-CB34A11D7320}.Debug|x86.Build.0 = Debug|x86
{264A20DB-903A-4B9F-84BD-CB34A11D7320}.Release|Any CPU.ActiveCfg = Release|Any CPU
{264A20DB-903A-4B9F-84BD-CB34A11D7320}.Release|Any CPU.Build.0 = Release|Any CPU
{264A20DB-903A-4B9F-84BD-CB34A11D7320}.Release|x86.ActiveCfg = Release|Any CPU
{264A20DB-903A-4B9F-84BD-CB34A11D7320}.Release|x86.Build.0 = Release|Any CPU
- {0C45CBA5-0FAD-4974-9314-A52DD63273C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0C45CBA5-0FAD-4974-9314-A52DD63273C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0C45CBA5-0FAD-4974-9314-A52DD63273C9}.Debug|x86.ActiveCfg = Debug|Any CPU
- {0C45CBA5-0FAD-4974-9314-A52DD63273C9}.Debug|x86.Build.0 = Debug|Any CPU
- {0C45CBA5-0FAD-4974-9314-A52DD63273C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0C45CBA5-0FAD-4974-9314-A52DD63273C9}.Release|Any CPU.Build.0 = Release|Any CPU
- {0C45CBA5-0FAD-4974-9314-A52DD63273C9}.Release|x86.ActiveCfg = Release|Any CPU
- {0C45CBA5-0FAD-4974-9314-A52DD63273C9}.Release|x86.Build.0 = Release|Any CPU
{5728476C-79B5-4556-B925-FBC8720266F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5728476C-79B5-4556-B925-FBC8720266F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5728476C-79B5-4556-B925-FBC8720266F0}.Debug|x86.ActiveCfg = Debug|x86
@@ -151,14 +141,6 @@
{5061B703-B7A6-4E82-A9AA-F73FD80520BF}.Release|Any CPU.Build.0 = Release|Any CPU
{5061B703-B7A6-4E82-A9AA-F73FD80520BF}.Release|x86.ActiveCfg = Release|x86
{5061B703-B7A6-4E82-A9AA-F73FD80520BF}.Release|x86.Build.0 = Release|x86
- {774D64C8-D36D-4841-8D26-3341EA7D8B4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {774D64C8-D36D-4841-8D26-3341EA7D8B4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {774D64C8-D36D-4841-8D26-3341EA7D8B4C}.Debug|x86.ActiveCfg = Debug|Any CPU
- {774D64C8-D36D-4841-8D26-3341EA7D8B4C}.Debug|x86.Build.0 = Debug|Any CPU
- {774D64C8-D36D-4841-8D26-3341EA7D8B4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {774D64C8-D36D-4841-8D26-3341EA7D8B4C}.Release|Any CPU.Build.0 = Release|Any CPU
- {774D64C8-D36D-4841-8D26-3341EA7D8B4C}.Release|x86.ActiveCfg = Release|Any CPU
- {774D64C8-D36D-4841-8D26-3341EA7D8B4C}.Release|x86.Build.0 = Release|Any CPU
{0ABFE354-E66C-4643-9D77-3B84B13F0485}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0ABFE354-E66C-4643-9D77-3B84B13F0485}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0ABFE354-E66C-4643-9D77-3B84B13F0485}.Debug|x86.ActiveCfg = Debug|x86
@@ -239,6 +221,14 @@
{38499782-D273-45EE-A5A4-19AC1FC36444}.Release|Any CPU.Build.0 = Release|Any CPU
{38499782-D273-45EE-A5A4-19AC1FC36444}.Release|x86.ActiveCfg = Release|x86
{38499782-D273-45EE-A5A4-19AC1FC36444}.Release|x86.Build.0 = Release|x86
+ {6358F078-D26F-445A-8C8D-7BAE115F2326}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6358F078-D26F-445A-8C8D-7BAE115F2326}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6358F078-D26F-445A-8C8D-7BAE115F2326}.Debug|x86.ActiveCfg = Debug|x86
+ {6358F078-D26F-445A-8C8D-7BAE115F2326}.Debug|x86.Build.0 = Debug|x86
+ {6358F078-D26F-445A-8C8D-7BAE115F2326}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {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
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
--
Gitblit v1.9.1