DBUtility/obj/Release/DBUtility.csproj.AssemblyReference.cacheBinary files differ
Model/obj/Release/Model.csproj.AssemblyReference.cacheBinary files differ
Model/obj/x86/Release/Model.csproj.AssemblyReference.cacheBinary files differ
NETERPNoWin/obj/Debug/NETERPNoWin.csproj.ResolveComReference.cacheBinary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/bin/Debug/SyntacticSugar.pdbBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.AssemblyReference.cacheBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,29 +1,5 @@ <<<<<<< HEAD D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb ======= D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb D:\工作代码\智云迈思\MES\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb <<<<<<< HEAD C:\Users\19858\Desktop\智云迈思\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache ======= D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache >>>>>>> f510c6405f7854fa0ab6bf92e72ea15dde056f4c SyntacticSugar/obj/Debug/SyntacticSugar.dllBinary files differ
SyntacticSugar/obj/Debug/SyntacticSugar.pdbBinary files differ
SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
File was deleted WebAPI/Properties/PublishProfiles/WTTFolder.pubxml.user
@@ -5,7 +5,7 @@ <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <_PublishTargetUrl>D:\网站发布\API</_PublishTargetUrl> <History>True|2026-02-28T06:44:48.8921146Z;True|2026-02-28T13:49:09.3417790+08:00;True|2026-02-28T13:36:36.7808689+08:00;True|2026-02-28T13:07:59.4097968+08:00;True|2026-02-28T11:22:16.2244092+08:00;False|2026-02-28T11:21:50.3452184+08:00;True|2026-02-27T15:15:26.7008273+08:00;False|2026-02-27T15:15:03.5165987+08:00;True|2026-02-24T13:26:35.7198126+08:00;True|2026-02-24T13:17:50.6475487+08:00;False|2026-02-24T13:17:16.4754994+08:00;True|2026-02-09T09:03:02.9552827+08:00;False|2026-02-09T09:02:19.7888361+08:00;True|2026-01-23T16:43:00.5233443+08:00;True|2026-01-23T15:52:34.0578166+08:00;True|2026-01-23T15:18:26.9929522+08:00;True|2026-01-23T14:54:41.7989523+08:00;True|2026-01-23T14:20:36.5052445+08:00;False|2026-01-23T13:57:17.0723425+08:00;True|2026-01-23T08:08:55.5799949+08:00;False|2026-01-23T08:08:18.0965301+08:00;True|2026-01-21T13:46:11.7257946+08:00;True|2026-01-20T09:22:33.7255529+08:00;False|2026-01-20T08:33:10.2890987+08:00;True|2026-01-19T13:53:48.2079321+08:00;False|2026-01-19T13:53:24.9464993+08:00;True|2026-01-16T15:23:46.2649561+08:00;True|2026-01-16T09:00:43.1528772+08:00;</History> <History>True|2026-03-04T02:10:33.7184690Z;False|2026-03-04T10:10:13.6608297+08:00;True|2026-02-28T14:44:48.8921146+08:00;True|2026-02-28T13:49:09.3417790+08:00;True|2026-02-28T13:36:36.7808689+08:00;True|2026-02-28T13:07:59.4097968+08:00;True|2026-02-28T11:22:16.2244092+08:00;False|2026-02-28T11:21:50.3452184+08:00;True|2026-02-27T15:15:26.7008273+08:00;False|2026-02-27T15:15:03.5165987+08:00;True|2026-02-24T13:26:35.7198126+08:00;True|2026-02-24T13:17:50.6475487+08:00;False|2026-02-24T13:17:16.4754994+08:00;True|2026-02-09T09:03:02.9552827+08:00;False|2026-02-09T09:02:19.7888361+08:00;True|2026-01-23T16:43:00.5233443+08:00;True|2026-01-23T15:52:34.0578166+08:00;True|2026-01-23T15:18:26.9929522+08:00;True|2026-01-23T14:54:41.7989523+08:00;True|2026-01-23T14:20:36.5052445+08:00;False|2026-01-23T13:57:17.0723425+08:00;True|2026-01-23T08:08:55.5799949+08:00;False|2026-01-23T08:08:18.0965301+08:00;True|2026-01-21T13:46:11.7257946+08:00;True|2026-01-20T09:22:33.7255529+08:00;False|2026-01-20T08:33:10.2890987+08:00;True|2026-01-19T13:53:48.2079321+08:00;False|2026-01-19T13:53:24.9464993+08:00;True|2026-01-16T15:23:46.2649561+08:00;True|2026-01-16T09:00:43.1528772+08:00;</History> </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> @@ -45,28 +45,28 @@ <publishTime>02/22/2013 16:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>02/28/2026 14:44:35</publishTime> <publishTime>03/04/2026 10:10:27</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>02/28/2026 14:44:35</publishTime> <publishTime>03/04/2026 10:10:27</publishTime> </File> <File Include="bin/BouncyCastle.Crypto.dll"> <publishTime>12/18/2020 05:32:28</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>02/28/2026 14:44:29</publishTime> <publishTime>03/04/2026 10:10:25</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>02/28/2026 14:44:29</publishTime> <publishTime>03/04/2026 10:10:25</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>02/28/2026 14:44:24</publishTime> <publishTime>03/04/2026 10:10:22</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>02/28/2026 14:44:24</publishTime> <publishTime>03/04/2026 10:10:22</publishTime> </File> <File Include="bin/Fleck.dll"> <publishTime>04/22/2021 11:48:12</publishTime> @@ -138,10 +138,10 @@ <publishTime>07/25/2012 19:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>02/28/2026 14:44:27</publishTime> <publishTime>03/04/2026 10:10:24</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>02/28/2026 14:44:27</publishTime> <publishTime>03/04/2026 10:10:24</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>08/18/2025 16:11:18</publishTime> @@ -177,34 +177,34 @@ <publishTime>11/13/2012 20:19:34</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>02/28/2026 14:44:19</publishTime> <publishTime>03/04/2026 10:10:21</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>02/28/2026 14:44:19</publishTime> <publishTime>03/04/2026 10:10:21</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>02/28/2026 14:44:21</publishTime> <publishTime>03/04/2026 10:10:21</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>02/28/2026 14:44:21</publishTime> <publishTime>03/04/2026 10:10:21</publishTime> </File> <File Include="bin/RestSharp.dll"> <publishTime>08/31/2012 06:22:50</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>02/28/2026 14:44:22</publishTime> <publishTime>03/04/2026 10:10:22</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>02/28/2026 14:44:22</publishTime> <publishTime>03/04/2026 10:10:22</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> </File> <File Include="bin/SyntacticSugar.dll"> <publishTime>02/28/2026 14:38:04</publishTime> <publishTime>03/04/2026 10:08:49</publishTime> </File> <File Include="bin/SyntacticSugar.pdb"> <publishTime>02/28/2026 14:38:04</publishTime> <publishTime>03/04/2026 10:08:49</publishTime> </File> <File Include="bin/System.Buffers.dll"> <publishTime>07/19/2017 18:01:28</publishTime> @@ -281,6 +281,9 @@ <File Include="bin/System.Web.Http.dll"> <publishTime>11/28/2018 21:01:00</publishTime> </File> <File Include="bin/System.Web.Http.Owin.dll"> <publishTime>01/28/2015 12:03:16</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> <publishTime>08/18/2025 16:11:18</publishTime> </File> @@ -315,19 +318,19 @@ <publishTime>05/09/2023 10:43:40</publishTime> </File> <File Include="bin/TopSdk.dll"> <publishTime>02/28/2026 14:38:07</publishTime> <publishTime>03/04/2026 10:08:51</publishTime> </File> <File Include="bin/TopSdk.pdb"> <publishTime>02/28/2026 14:38:07</publishTime> <publishTime>03/04/2026 10:08:51</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>02/28/2026 14:44:46</publishTime> <publishTime>03/04/2026 10:10:32</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>02/28/2026 14:44:46</publishTime> <publishTime>03/04/2026 10:10:32</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> @@ -432,7 +435,7 @@ <publishTime>08/18/2025 16:11:18</publishTime> </File> <File Include="packages.config"> <publishTime>02/06/2026 14:36:49</publishTime> <publishTime>03/04/2026 09:23:23</publishTime> </File> <File Include="Properties/PublishProfiles/JFAPI.pubxml.user"> <publishTime>12/08/2025 10:29:30</publishTime> WebAPI/WebAPI.csproj
@@ -408,10 +408,8 @@ <Compile Include="App_Start\BundleConfig.cs" /> <Compile Include="App_Start\FilterConfig.cs" /> <Compile Include="App_Start\RouteConfig.cs" /> <Compile Include="App_Start\Startup.cs" /> <Compile Include="App_Start\SwaggerConfig.cs" /> <Compile Include="App_Start\WebApiConfig.cs" /> <Compile Include="App_Start\WebSocketHub.cs" /> <Compile Include="Controllers\BaseSet\Gy_BarCodeBillController.cs" /> <Compile Include="Controllers\BaseSet\Gy_ConkTypeController.cs" /> <Compile Include="Controllers\BaseSet\Gy_ColorClassController.cs" /> WebAPI/WebAPI.csproj.user
@@ -2,11 +2,8 @@ <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig> <<<<<<< HEAD <LastActiveSolutionConfig>Debug|x86</LastActiveSolutionConfig> ======= <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig> >>>>>>> f510c6405f7854fa0ab6bf92e72ea15dde056f4c <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <UseIISExpress>true</UseIISExpress> <Use64BitIISExpress /> <IISExpressSSLPort /> @@ -16,7 +13,7 @@ <UseGlobalApplicationHostFile /> <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile1.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\gz\MES-WEB-API\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile8.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-API\WebAPI\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\智云迈思\MES-WEB-API\WebAPI\Properties\PublishProfiles\WTTFolder.pubxml</NameOfLastUsedPublishProfile> <ProjectView>ShowAllFiles</ProjectView> </PropertyGroup> <ProjectExtensions> sdk_dingding/TopSdk/bin/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/bin/Debug/TopSdk.pdbBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.AssemblyReference.cacheBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.csproj.FileListAbsolute.txt
@@ -1,20 +1,5 @@ <<<<<<< HEAD D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll D:\网站发布\后端代码\MES-WEB-API\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb ======= D:\工作代码\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll D:\工作代码\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb D:\工作代码\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache D:\工作代码\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache D:\工作代码\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll D:\工作代码\智云迈思\MES\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb C:\Users\19858\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.dll C:\Users\19858\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\bin\Debug\TopSdk.pdb C:\Users\19858\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.AssemblyReference.cache C:\Users\19858\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.csproj.CoreCompileInputs.cache C:\Users\19858\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.dll C:\Users\19858\Desktop\智云迈思\MES-WEB-API\sdk_dingding\TopSdk\obj\Debug\TopSdk.pdb >>>>>>> b2e18e3fc0735edf1fc378936c81e5971bc52f61 sdk_dingding/TopSdk/obj/Debug/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/obj/Debug/TopSdk.pdbBinary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.CoreCompileInputs.cache
File was deleted sdk_dingding/TopSdk/obj/Release/TopSdk.csproj.FileListAbsolute.txt
File was deleted sdk_dingding/TopSdk/obj/Release/TopSdk.dllBinary files differ
sdk_dingding/TopSdk/obj/Release/TopSdk.pdbBinary files differ
