From 7b9d53540c9b58ed78a516f592d970b96dd79c6e Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期六, 28 二月 2026 13:22:48 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BLL/bin/Release/DAL.dll | 0
BLL/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/DBUtility.dll | 0
DAL/bin/Release/Pub_Control.dll | 0
DBUtility/bin/Release/Pub_Control.pdb | 0
WebAPI/WebAPI.csproj.user | 2
BLL/bin/Release/SQLHelper.dll | 0
DAL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/Model.dll | 0
DBUtility/bin/Release/Pub_Class.dll | 0
DBUtility/bin/Release/Pub_Control.dll | 0
Model/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/Pub_Control.pdb | 0
DAL/bin/Release/DAL.pdb | 0
SQLHelper/obj/Release/SQLHelper.dll | 0
Model/bin/Release/Pub_Control.pdb | 0
BLL/bin/Release/Model.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.pdb | 0
BLL/bin/Release/DAL.pdb | 0
Model/bin/Release/Pub_Class.pdb | 0
BLL/bin/Release/Model.pdb | 0
DAL/bin/Release/DAL.dll | 0
DAL/bin/Release/Model.pdb | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.dll | 0
SQLHelper/obj/Release/SQLHelper.pdb | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.dll | 0
Model/obj/Release/Model.pdb | 0
BLL/bin/Release/BLL.pdb | 0
DBUtility/bin/Release/DBUtility.pdb | 0
DBUtility/bin/Release/DBUtility.dll | 0
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt | 4 --
Model/bin/Release/Pub_Control.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache | 0
DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache | 0
Pub_Control/bin/Release/Pub_Class.pdb | 0
sdk_dingding/TopSdk/bin/Release/TopSdk.pdb | 0
Pub_Control/bin/Release/Pub_Class.dll | 0
BLL/bin/Release/Pub_Control.pdb | 0
Pub_Class/bin/Release/Pub_Class.pdb | 0
Pub_Control/bin/Release/Pub_Control.dll | 0
BLL/bin/Release/DBUtility.pdb | 0
DAL/bin/Release/SQLHelper.dll | 0
Model/bin/Release/DBUtility.pdb | 0
SQLHelper/bin/Release/SQLHelper.dll | 0
SQLHelper/bin/Release/Pub_Class.pdb | 0
BLL/bin/Release/Pub_Control.dll | 0
Pub_Class/bin/Release/Pub_Class.dll | 0
DAL/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache | 0
SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache | 0
SQLHelper/bin/Release/Pub_Class.dll | 0
SQLHelper/bin/Release/SQLHelper.pdb | 0
DBUtility/obj/Release/DBUtility.pdb | 0
Model/bin/Release/DBUtility.dll | 0
DAL/bin/Release/Pub_Class.pdb | 0
BLL/bin/Release/DBUtility.dll | 0
BLL/bin/Release/BLL.dll | 0
Pub_Control/bin/Release/Pub_Control.pdb | 0
DBUtility/obj/Release/DBUtility.dll | 0
Model/obj/Release/Model.dll | 0
BLL/bin/Release/Pub_Class.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml | 5 --
DBUtility/bin/Release/SQLHelper.dll | 0
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt | 1
Model/obj/Release/Model.csproj.AssemblyReference.cache | 0
Model/bin/Release/Model.pdb | 0
DBUtility/bin/Release/SQLHelper.pdb | 0
DAL/bin/Release/Pub_Class.dll | 0
Model/bin/Release/Pub_Class.dll | 0
Model/bin/Release/Model.dll | 0
DBUtility/bin/Release/Pub_Class.pdb | 0
BLL/bin/Release/Pub_Class.pdb | 0
Model/bin/Release/SQLHelper.dll | 0
WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml.user | 92 ----------------------------------------------
74 files changed, 2 insertions(+), 102 deletions(-)
diff --git a/BLL/bin/Release/BLL.dll b/BLL/bin/Release/BLL.dll
index 93ba786..e275a1e 100644
--- a/BLL/bin/Release/BLL.dll
+++ b/BLL/bin/Release/BLL.dll
Binary files differ
diff --git a/BLL/bin/Release/BLL.pdb b/BLL/bin/Release/BLL.pdb
index e81d239..98dfcc8 100644
--- a/BLL/bin/Release/BLL.pdb
+++ b/BLL/bin/Release/BLL.pdb
Binary files differ
diff --git a/BLL/bin/Release/DAL.dll b/BLL/bin/Release/DAL.dll
index e76295a..7e9721b 100644
--- a/BLL/bin/Release/DAL.dll
+++ b/BLL/bin/Release/DAL.dll
Binary files differ
diff --git a/BLL/bin/Release/DAL.pdb b/BLL/bin/Release/DAL.pdb
index 888881d..e202eaf 100644
--- a/BLL/bin/Release/DAL.pdb
+++ b/BLL/bin/Release/DAL.pdb
Binary files differ
diff --git a/BLL/bin/Release/DBUtility.dll b/BLL/bin/Release/DBUtility.dll
index bda9d28..caae2ba 100644
--- a/BLL/bin/Release/DBUtility.dll
+++ b/BLL/bin/Release/DBUtility.dll
Binary files differ
diff --git a/BLL/bin/Release/DBUtility.pdb b/BLL/bin/Release/DBUtility.pdb
index 8c14b16..2a1c44a 100644
--- a/BLL/bin/Release/DBUtility.pdb
+++ b/BLL/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/BLL/bin/Release/Model.dll b/BLL/bin/Release/Model.dll
index a481633..65a17f3 100644
--- a/BLL/bin/Release/Model.dll
+++ b/BLL/bin/Release/Model.dll
Binary files differ
diff --git a/BLL/bin/Release/Model.pdb b/BLL/bin/Release/Model.pdb
index 6d94762..b4f7dcc 100644
--- a/BLL/bin/Release/Model.pdb
+++ b/BLL/bin/Release/Model.pdb
Binary files differ
diff --git a/BLL/bin/Release/Pub_Class.dll b/BLL/bin/Release/Pub_Class.dll
index 03b7c45..a2a8785 100644
--- a/BLL/bin/Release/Pub_Class.dll
+++ b/BLL/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/BLL/bin/Release/Pub_Class.pdb b/BLL/bin/Release/Pub_Class.pdb
index 20a4366..e2eef9b 100644
--- a/BLL/bin/Release/Pub_Class.pdb
+++ b/BLL/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/BLL/bin/Release/Pub_Control.dll b/BLL/bin/Release/Pub_Control.dll
index 34948f7..e26f662 100644
--- a/BLL/bin/Release/Pub_Control.dll
+++ b/BLL/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/BLL/bin/Release/Pub_Control.pdb b/BLL/bin/Release/Pub_Control.pdb
index c18604f..b0d30e8 100644
--- a/BLL/bin/Release/Pub_Control.pdb
+++ b/BLL/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/BLL/bin/Release/SQLHelper.dll b/BLL/bin/Release/SQLHelper.dll
index 50ce9c4..8164e83 100644
--- a/BLL/bin/Release/SQLHelper.dll
+++ b/BLL/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/BLL/bin/Release/SQLHelper.pdb b/BLL/bin/Release/SQLHelper.pdb
index 90a641a..eaf72e4 100644
--- a/BLL/bin/Release/SQLHelper.pdb
+++ b/BLL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DAL/bin/Release/DAL.dll b/DAL/bin/Release/DAL.dll
index e76295a..7e9721b 100644
--- a/DAL/bin/Release/DAL.dll
+++ b/DAL/bin/Release/DAL.dll
Binary files differ
diff --git a/DAL/bin/Release/DAL.pdb b/DAL/bin/Release/DAL.pdb
index 888881d..e202eaf 100644
--- a/DAL/bin/Release/DAL.pdb
+++ b/DAL/bin/Release/DAL.pdb
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.dll b/DAL/bin/Release/DBUtility.dll
index bda9d28..caae2ba 100644
--- a/DAL/bin/Release/DBUtility.dll
+++ b/DAL/bin/Release/DBUtility.dll
Binary files differ
diff --git a/DAL/bin/Release/DBUtility.pdb b/DAL/bin/Release/DBUtility.pdb
index 8c14b16..2a1c44a 100644
--- a/DAL/bin/Release/DBUtility.pdb
+++ b/DAL/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/DAL/bin/Release/Model.dll b/DAL/bin/Release/Model.dll
index a481633..65a17f3 100644
--- a/DAL/bin/Release/Model.dll
+++ b/DAL/bin/Release/Model.dll
Binary files differ
diff --git a/DAL/bin/Release/Model.pdb b/DAL/bin/Release/Model.pdb
index 6d94762..b4f7dcc 100644
--- a/DAL/bin/Release/Model.pdb
+++ b/DAL/bin/Release/Model.pdb
Binary files differ
diff --git a/DAL/bin/Release/Pub_Class.dll b/DAL/bin/Release/Pub_Class.dll
index 03b7c45..a2a8785 100644
--- a/DAL/bin/Release/Pub_Class.dll
+++ b/DAL/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/DAL/bin/Release/Pub_Class.pdb b/DAL/bin/Release/Pub_Class.pdb
index 20a4366..e2eef9b 100644
--- a/DAL/bin/Release/Pub_Class.pdb
+++ b/DAL/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/DAL/bin/Release/Pub_Control.dll b/DAL/bin/Release/Pub_Control.dll
index 34948f7..e26f662 100644
--- a/DAL/bin/Release/Pub_Control.dll
+++ b/DAL/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/DAL/bin/Release/Pub_Control.pdb b/DAL/bin/Release/Pub_Control.pdb
index c18604f..b0d30e8 100644
--- a/DAL/bin/Release/Pub_Control.pdb
+++ b/DAL/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.dll b/DAL/bin/Release/SQLHelper.dll
index 50ce9c4..8164e83 100644
--- a/DAL/bin/Release/SQLHelper.dll
+++ b/DAL/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/DAL/bin/Release/SQLHelper.pdb b/DAL/bin/Release/SQLHelper.pdb
index 90a641a..eaf72e4 100644
--- a/DAL/bin/Release/SQLHelper.pdb
+++ b/DAL/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/DBUtility.dll b/DBUtility/bin/Release/DBUtility.dll
index bda9d28..caae2ba 100644
--- a/DBUtility/bin/Release/DBUtility.dll
+++ b/DBUtility/bin/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/bin/Release/DBUtility.pdb b/DBUtility/bin/Release/DBUtility.pdb
index 8c14b16..2a1c44a 100644
--- a/DBUtility/bin/Release/DBUtility.pdb
+++ b/DBUtility/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Class.dll b/DBUtility/bin/Release/Pub_Class.dll
index 03b7c45..a2a8785 100644
--- a/DBUtility/bin/Release/Pub_Class.dll
+++ b/DBUtility/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Class.pdb b/DBUtility/bin/Release/Pub_Class.pdb
index 20a4366..e2eef9b 100644
--- a/DBUtility/bin/Release/Pub_Class.pdb
+++ b/DBUtility/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Control.dll b/DBUtility/bin/Release/Pub_Control.dll
index 34948f7..e26f662 100644
--- a/DBUtility/bin/Release/Pub_Control.dll
+++ b/DBUtility/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/DBUtility/bin/Release/Pub_Control.pdb b/DBUtility/bin/Release/Pub_Control.pdb
index c18604f..b0d30e8 100644
--- a/DBUtility/bin/Release/Pub_Control.pdb
+++ b/DBUtility/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.dll b/DBUtility/bin/Release/SQLHelper.dll
index 50ce9c4..8164e83 100644
--- a/DBUtility/bin/Release/SQLHelper.dll
+++ b/DBUtility/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/DBUtility/bin/Release/SQLHelper.pdb b/DBUtility/bin/Release/SQLHelper.pdb
index 90a641a..eaf72e4 100644
--- a/DBUtility/bin/Release/SQLHelper.pdb
+++ b/DBUtility/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
index daa893a..619768b 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
index 4acb931..7c45b82 100644
--- a/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
+++ b/DBUtility/obj/Release/DBUtility.csproj.GenerateResource.Cache
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.dll b/DBUtility/obj/Release/DBUtility.dll
index bda9d28..caae2ba 100644
--- a/DBUtility/obj/Release/DBUtility.dll
+++ b/DBUtility/obj/Release/DBUtility.dll
Binary files differ
diff --git a/DBUtility/obj/Release/DBUtility.pdb b/DBUtility/obj/Release/DBUtility.pdb
index 8c14b16..2a1c44a 100644
--- a/DBUtility/obj/Release/DBUtility.pdb
+++ b/DBUtility/obj/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/bin/Release/DBUtility.dll b/Model/bin/Release/DBUtility.dll
index bda9d28..caae2ba 100644
--- a/Model/bin/Release/DBUtility.dll
+++ b/Model/bin/Release/DBUtility.dll
Binary files differ
diff --git a/Model/bin/Release/DBUtility.pdb b/Model/bin/Release/DBUtility.pdb
index 8c14b16..2a1c44a 100644
--- a/Model/bin/Release/DBUtility.pdb
+++ b/Model/bin/Release/DBUtility.pdb
Binary files differ
diff --git a/Model/bin/Release/Model.dll b/Model/bin/Release/Model.dll
index a481633..65a17f3 100644
--- a/Model/bin/Release/Model.dll
+++ b/Model/bin/Release/Model.dll
Binary files differ
diff --git a/Model/bin/Release/Model.pdb b/Model/bin/Release/Model.pdb
index 6d94762..b4f7dcc 100644
--- a/Model/bin/Release/Model.pdb
+++ b/Model/bin/Release/Model.pdb
Binary files differ
diff --git a/Model/bin/Release/Pub_Class.dll b/Model/bin/Release/Pub_Class.dll
index 03b7c45..a2a8785 100644
--- a/Model/bin/Release/Pub_Class.dll
+++ b/Model/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Model/bin/Release/Pub_Class.pdb b/Model/bin/Release/Pub_Class.pdb
index 20a4366..e2eef9b 100644
--- a/Model/bin/Release/Pub_Class.pdb
+++ b/Model/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Model/bin/Release/Pub_Control.dll b/Model/bin/Release/Pub_Control.dll
index 34948f7..e26f662 100644
--- a/Model/bin/Release/Pub_Control.dll
+++ b/Model/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/Model/bin/Release/Pub_Control.pdb b/Model/bin/Release/Pub_Control.pdb
index c18604f..b0d30e8 100644
--- a/Model/bin/Release/Pub_Control.pdb
+++ b/Model/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.dll b/Model/bin/Release/SQLHelper.dll
index 50ce9c4..8164e83 100644
--- a/Model/bin/Release/SQLHelper.dll
+++ b/Model/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/Model/bin/Release/SQLHelper.pdb b/Model/bin/Release/SQLHelper.pdb
index 90a641a..eaf72e4 100644
--- a/Model/bin/Release/SQLHelper.pdb
+++ b/Model/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/Model/obj/Release/Model.csproj.AssemblyReference.cache b/Model/obj/Release/Model.csproj.AssemblyReference.cache
index ffbb71e..2ddc181 100644
--- a/Model/obj/Release/Model.csproj.AssemblyReference.cache
+++ b/Model/obj/Release/Model.csproj.AssemblyReference.cache
Binary files differ
diff --git a/Model/obj/Release/Model.dll b/Model/obj/Release/Model.dll
index a481633..65a17f3 100644
--- a/Model/obj/Release/Model.dll
+++ b/Model/obj/Release/Model.dll
Binary files differ
diff --git a/Model/obj/Release/Model.pdb b/Model/obj/Release/Model.pdb
index 6d94762..b4f7dcc 100644
--- a/Model/obj/Release/Model.pdb
+++ b/Model/obj/Release/Model.pdb
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.dll b/Pub_Class/bin/Release/Pub_Class.dll
index 03b7c45..a2a8785 100644
--- a/Pub_Class/bin/Release/Pub_Class.dll
+++ b/Pub_Class/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Class/bin/Release/Pub_Class.pdb b/Pub_Class/bin/Release/Pub_Class.pdb
index 20a4366..e2eef9b 100644
--- a/Pub_Class/bin/Release/Pub_Class.pdb
+++ b/Pub_Class/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.dll b/Pub_Control/bin/Release/Pub_Class.dll
index 03b7c45..a2a8785 100644
--- a/Pub_Control/bin/Release/Pub_Class.dll
+++ b/Pub_Control/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Class.pdb b/Pub_Control/bin/Release/Pub_Class.pdb
index 20a4366..e2eef9b 100644
--- a/Pub_Control/bin/Release/Pub_Class.pdb
+++ b/Pub_Control/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Control.dll b/Pub_Control/bin/Release/Pub_Control.dll
index 34948f7..e26f662 100644
--- a/Pub_Control/bin/Release/Pub_Control.dll
+++ b/Pub_Control/bin/Release/Pub_Control.dll
Binary files differ
diff --git a/Pub_Control/bin/Release/Pub_Control.pdb b/Pub_Control/bin/Release/Pub_Control.pdb
index c18604f..b0d30e8 100644
--- a/Pub_Control/bin/Release/Pub_Control.pdb
+++ b/Pub_Control/bin/Release/Pub_Control.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.dll b/SQLHelper/bin/Release/Pub_Class.dll
index 03b7c45..a2a8785 100644
--- a/SQLHelper/bin/Release/Pub_Class.dll
+++ b/SQLHelper/bin/Release/Pub_Class.dll
Binary files differ
diff --git a/SQLHelper/bin/Release/Pub_Class.pdb b/SQLHelper/bin/Release/Pub_Class.pdb
index 20a4366..e2eef9b 100644
--- a/SQLHelper/bin/Release/Pub_Class.pdb
+++ b/SQLHelper/bin/Release/Pub_Class.pdb
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.dll b/SQLHelper/bin/Release/SQLHelper.dll
index 50ce9c4..8164e83 100644
--- a/SQLHelper/bin/Release/SQLHelper.dll
+++ b/SQLHelper/bin/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/bin/Release/SQLHelper.pdb b/SQLHelper/bin/Release/SQLHelper.pdb
index 90a641a..eaf72e4 100644
--- a/SQLHelper/bin/Release/SQLHelper.pdb
+++ b/SQLHelper/bin/Release/SQLHelper.pdb
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
index 810face..2c876b1 100644
--- a/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
+++ b/SQLHelper/obj/Release/SQLHelper.csproj.AssemblyReference.cache
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.dll b/SQLHelper/obj/Release/SQLHelper.dll
index 50ce9c4..8164e83 100644
--- a/SQLHelper/obj/Release/SQLHelper.dll
+++ b/SQLHelper/obj/Release/SQLHelper.dll
Binary files differ
diff --git a/SQLHelper/obj/Release/SQLHelper.pdb b/SQLHelper/obj/Release/SQLHelper.pdb
index 90a641a..eaf72e4 100644
--- a/SQLHelper/obj/Release/SQLHelper.pdb
+++ b/SQLHelper/obj/Release/SQLHelper.pdb
Binary files differ
diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
index 8d04edd..50d0d10 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -8,13 +8,9 @@
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
-<<<<<<< HEAD
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
D:\gz\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
-=======
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
->>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml b/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml
index 42c9d64..378a086 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml
@@ -10,11 +10,6 @@
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
-<<<<<<< HEAD
- <PublishUrl>D:\gz\wy\MES-WEB-API</PublishUrl>
-=======
<PublishUrl>E:\gz\缃戠珯鍙戝竷\MES-WEB-API</PublishUrl>
->>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
- <WebPublishMethod>FileSystem</WebPublishMethod>
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml.user
index 7a3c7d4..468d5e3 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile7.pubxml.user
@@ -4,13 +4,8 @@
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
-<<<<<<< HEAD
- <History>True|2026-02-28T02:31:32.5199626Z;True|2026-02-28T09:24:47.0353907+08:00;True|2026-02-28T09:18:08.3189382+08:00;True|2026-02-28T09:12:57.9705097+08:00;True|2026-02-28T09:11:45.6332249+08:00;True|2026-02-28T09:10:52.2970685+08:00;False|2026-02-28T09:10:36.7739833+08:00;True|2026-02-27T16:36:29.9648231+08:00;True|2026-02-27T16:34:26.3915967+08:00;True|2026-02-27T16:30:24.8243216+08:00;True|2026-02-27T16:28:31.5194363+08:00;True|2026-02-27T16:26:42.5472554+08:00;True|2026-02-27T16:25:28.9632012+08:00;True|2026-02-27T16:22:43.7354490+08:00;True|2026-02-27T16:19:08.5178580+08:00;True|2026-02-27T16:16:41.8327071+08:00;True|2026-02-27T15:51:20.9252560+08:00;True|2026-02-27T15:49:29.0739490+08:00;True|2026-02-27T15:45:14.7127787+08:00;True|2026-02-27T15:35:28.8564182+08:00;True|2026-02-27T14:14:31.7930971+08:00;True|2026-02-27T14:11:27.1839644+08:00;True|2026-02-27T13:03:01.6565352+08:00;True|2026-02-27T13:02:48.3485868+08:00;True|2026-02-27T11:31:22.3021282+08:00;False|2026-02-27T11:31:08.4603091+08:00;</History>
- <_PublishTargetUrl>D:\gz\wy\MES-WEB-API</_PublishTargetUrl>
-=======
<History>True|2026-02-06T00:31:03.6312878Z;True|2026-02-06T08:23:52.9733115+08:00;False|2026-02-06T08:23:11.0102034+08:00;True|2026-02-05T19:21:05.2158159+08:00;True|2026-02-05T19:12:33.5524772+08:00;False|2026-02-05T19:12:02.9803456+08:00;True|2026-02-05T16:37:50.6355254+08:00;True|2026-02-05T16:34:32.0212507+08:00;True|2026-02-05T16:20:41.9707118+08:00;True|2026-02-05T15:44:12.8408268+08:00;True|2026-02-05T15:29:35.7671005+08:00;True|2026-02-05T15:20:42.9402452+08:00;True|2026-02-05T15:13:13.1744544+08:00;True|2026-02-05T14:50:39.7687392+08:00;True|2026-02-05T10:40:08.2854769+08:00;True|2026-02-03T09:19:29.6074097+08:00;True|2026-02-03T08:05:38.9025470+08:00;False|2026-02-03T08:04:54.8666303+08:00;True|2026-01-26T10:36:06.6951875+08:00;False|2026-01-26T10:35:27.2587580+08:00;</History>
<_PublishTargetUrl>E:\gz\缃戠珯鍙戝竷\MES-WEB-API</_PublishTargetUrl>
->>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -50,49 +45,28 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
-<<<<<<< HEAD
<publishTime>02/27/2026 11:29:46</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>02/27/2026 11:29:46</publishTime>
-=======
- <publishTime>02/06/2026 08:30:50</publishTime>
- </File>
- <File Include="bin/BLL.pdb">
- <publishTime>02/06/2026 08:30:50</publishTime>
->>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
-<<<<<<< HEAD
<publishTime>02/27/2026 11:29:45</publishTime>
</File>
<File Include="bin/DAL.pdb">
<publishTime>02/27/2026 11:29:45</publishTime>
-=======
- <publishTime>02/06/2026 08:30:47</publishTime>
- </File>
- <File Include="bin/DAL.pdb">
- <publishTime>02/06/2026 08:30:47</publishTime>
->>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
-<<<<<<< HEAD
<publishTime>02/27/2026 11:29:42</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
<publishTime>02/27/2026 11:29:42</publishTime>
-=======
- <publishTime>02/04/2026 18:25:43</publishTime>
- </File>
- <File Include="bin/DBUtility.pdb">
- <publishTime>02/04/2026 18:25:43</publishTime>
->>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
</File>
<File Include="bin/Fleck.dll">
<publishTime>04/22/2021 11:48:12</publishTime>
@@ -164,17 +138,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
-<<<<<<< HEAD
<publishTime>02/27/2026 11:29:43</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>02/27/2026 11:29:43</publishTime>
-=======
- <publishTime>02/05/2026 09:48:42</publishTime>
- </File>
- <File Include="bin/Model.pdb">
- <publishTime>02/05/2026 09:48:42</publishTime>
->>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>11/12/2025 10:43:47</publishTime>
@@ -210,7 +177,6 @@
<publishTime>11/13/2012 12:19:34</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
-<<<<<<< HEAD
<publishTime>02/27/2026 11:29:41</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
@@ -221,50 +187,24 @@
</File>
<File Include="bin/Pub_Control.pdb">
<publishTime>02/27/2026 11:29:42</publishTime>
-=======
- <publishTime>02/04/2026 18:25:40</publishTime>
- </File>
- <File Include="bin/Pub_Class.pdb">
- <publishTime>02/04/2026 18:25:40</publishTime>
- </File>
- <File Include="bin/Pub_Control.dll">
- <publishTime>02/04/2026 18:25:42</publishTime>
- </File>
- <File Include="bin/Pub_Control.pdb">
- <publishTime>02/04/2026 18:25:42</publishTime>
->>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
-<<<<<<< HEAD
<publishTime>02/27/2026 11:29:42</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
<publishTime>02/27/2026 11:29:42</publishTime>
-=======
- <publishTime>02/04/2026 18:25:42</publishTime>
- </File>
- <File Include="bin/SQLHelper.pdb">
- <publishTime>02/04/2026 18:25:42</publishTime>
->>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
-<<<<<<< HEAD
<publishTime>02/27/2026 11:29:40</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
<publishTime>02/27/2026 11:29:40</publishTime>
-=======
- <publishTime>02/04/2026 18:16:05</publishTime>
- </File>
- <File Include="bin/SyntacticSugar.pdb">
- <publishTime>02/04/2026 18:16:05</publishTime>
->>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -375,23 +315,15 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
-<<<<<<< HEAD
<publishTime>02/27/2026 11:29:43</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
<publishTime>02/27/2026 11:29:43</publishTime>
-=======
- <publishTime>02/04/2026 16:46:28</publishTime>
- </File>
- <File Include="bin/TopSdk.pdb">
- <publishTime>02/04/2026 16:46:28</publishTime>
->>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
-<<<<<<< HEAD
<publishTime>02/28/2026 10:31:28</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
@@ -399,15 +331,6 @@
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>02/28/2026 10:31:31</publishTime>
-=======
- <publishTime>02/06/2026 08:30:57</publishTime>
- </File>
- <File Include="bin/WebAPI.pdb">
- <publishTime>02/06/2026 08:30:57</publishTime>
- </File>
- <File Include="bin/WebAPI.XmlSerializers.dll">
- <publishTime>02/06/2026 08:31:01</publishTime>
->>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/18/2013 01:03:52</publishTime>
@@ -512,27 +435,16 @@
<publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="packages.config">
-<<<<<<< HEAD
<publishTime>01/27/2026 08:36:04</publishTime>
-=======
- <publishTime>02/04/2026 16:46:28</publishTime>
->>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
</File>
<File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
<publishTime>12/09/2025 08:11:33</publishTime>
</File>
<File Include="Scripts/jquery.signalR-2.2.2.js">
-<<<<<<< HEAD
<publishTime>01/27/2026 08:35:50</publishTime>
</File>
<File Include="Scripts/jquery.signalR-2.2.2.min.js">
<publishTime>01/27/2026 08:35:50</publishTime>
-=======
- <publishTime>02/04/2026 16:46:28</publishTime>
- </File>
- <File Include="Scripts/jquery.signalR-2.2.2.min.js">
- <publishTime>02/04/2026 16:46:28</publishTime>
->>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
</File>
<File Include="Template/barCodeTemplateStorage.json">
<publishTime>11/12/2025 10:43:47</publishTime>
@@ -643,11 +555,7 @@
<publishTime>11/12/2025 10:43:47</publishTime>
</File>
<File Include="Web.config">
-<<<<<<< HEAD
<publishTime>02/27/2026 11:31:21</publishTime>
-=======
- <publishTime>02/05/2026 10:40:07</publishTime>
->>>>>>> 0ad8b5d768d28752aeb1aa2c9d548bcc12757f40
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebAPI/WebAPI.csproj.user b/WebAPI/WebAPI.csproj.user
index a319fe3..2f0d4b7 100644
--- a/WebAPI/WebAPI.csproj.user
+++ b/WebAPI/WebAPI.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
index e705d78..0d87fae 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
index ea55c00..22c96d0 100644
--- a/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/bin/Release/TopSdk.pdb
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
index 203a45e..d77c332 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.AssemblyReference.cache
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
index ebccd90..469ad75 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
@@ -14,3 +14,4 @@
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.CoreCompileInputs.cache
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.dll
D:\gz\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.pdb
+D:\WorkBench\MES-WEB-API\sdk_dingding\TopSdk\obj\Release\TopSdk.csproj.AssemblyReference.cache
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
index e705d78..0d87fae 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.dll
Binary files differ
diff --git a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
index ea55c00..22c96d0 100644
--- a/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
+++ b/sdk_dingding/TopSdk/obj/Release/TopSdk.pdb
Binary files differ
--
Gitblit v1.9.1