resolve merge conflicts: keep theirs for all binary files

dytyqx

1 天以前 ba927b1faad68ab38d053ee9ea9eeac4b1a5531b

 WebAPI/Properties/PublishProfiles/FolderProfile8.pubxml.user

@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <_PublishTargetUrl>D:\gz\wy\MES-WEB-API</_PublishTargetUrl>
    <History>True|2026-02-04T06:14:08.6815293Z;True|2026-02-04T14:12:55.3426756+08:00;True|2026-02-04T14:06:04.8563633+08:00;True|2026-02-04T13:59:45.8674762+08:00;True|2026-02-04T13:59:40.8476722+08:00;True|2026-02-04T13:49:27.8178193+08:00;True|2026-02-04T13:47:17.9531917+08:00;True|2026-02-04T13:33:13.4905042+08:00;True|2026-02-04T11:13:26.7587124+08:00;True|2026-02-04T10:44:11.8398866+08:00;True|2026-02-04T10:37:30.4140022+08:00;True|2026-02-04T10:10:15.2756301+08:00;True|2026-02-04T10:06:43.8401980+08:00;True|2026-02-04T09:43:16.4168165+08:00;True|2026-02-04T09:38:57.6155453+08:00;True|2026-02-04T09:36:23.7275649+08:00;True|2026-02-04T09:18:39.5157535+08:00;True|2026-02-04T08:55:39.8422012+08:00;True|2026-02-04T08:50:53.2493857+08:00;True|2026-02-04T08:49:13.6401738+08:00;True|2026-02-04T08:47:44.4063649+08:00;True|2026-02-04T08:27:35.3397920+08:00;True|2026-02-04T08:11:10.8455212+08:00;False|2026-02-04T08:10:46.8065171+08:00;True|2026-02-03T11:17:54.1264839+08:00;True|2026-02-03T11:13:07.3503801+08:00;True|2026-02-03T10:57:22.0499756+08:00;True|2026-02-03T10:49:51.5729577+08:00;False|2026-02-03T10:49:34.3419439+08:00;True|2026-02-02T16:46:50.4584549+08:00;True|2026-02-02T16:42:58.9718820+08:00;True|2026-02-02T16:37:04.3367393+08:00;True|2026-02-02T16:25:15.8758401+08:00;True|2026-02-02T16:23:39.5355352+08:00;False|2026-02-02T16:22:23.6470725+08:00;True|2026-01-27T14:38:42.1847305+08:00;True|2026-01-27T14:35:31.4859936+08:00;True|2026-01-27T14:18:36.2122726+08:00;True|2026-01-27T14:03:03.8424130+08:00;True|2026-01-27T13:14:23.0197795+08:00;True|2026-01-27T11:26:12.7603302+08:00;True|2026-01-27T11:23:11.2980950+08:00;True|2026-01-27T11:17:42.7742881+08:00;True|2026-01-27T10:27:13.8894331+08:00;True|2026-01-27T10:22:33.6468907+08:00;True|2026-01-27T10:13:18.5553398+08:00;False|2026-01-27T10:10:23.9320618+08:00;True|2026-01-27T10:00:58.3355300+08:00;False|2026-01-27T10:00:37.4820904+08:00;True|2026-01-27T09:45:12.8813559+08:00;True|2026-01-27T09:41:43.1787804+08:00;True|2026-01-27T09:40:22.3478291+08:00;True|2026-01-27T09:39:19.6165154+08:00;True|2026-01-27T09:37:31.7523727+08:00;True|2026-01-27T08:33:15.6345855+08:00;True|2026-01-27T08:25:27.8955175+08:00;False|2026-01-27T08:24:59.4512268+08:00;True|2026-01-26T16:40:38.8412768+08:00;True|2026-01-26T16:16:41.7932895+08:00;True|2026-01-26T16:15:35.4808695+08:00;True|2026-01-26T16:08:19.1707669+08:00;True|2026-01-26T16:07:38.4808637+08:00;True|2026-01-26T16:00:28.5139031+08:00;True|2026-01-26T15:56:20.5415856+08:00;True|2026-01-26T15:47:55.9662192+08:00;True|2026-01-26T15:40:45.2534281+08:00;True|2026-01-26T15:39:09.6931174+08:00;True|2026-01-26T15:37:51.9154771+08:00;True|2026-01-26T15:33:35.6039826+08:00;True|2026-01-26T15:31:52.9425047+08:00;True|2026-01-26T15:30:45.3923302+08:00;True|2026-01-26T15:29:05.0429905+08:00;True|2026-01-26T15:27:05.4558977+08:00;True|2026-01-26T15:26:29.2629885+08:00;True|2026-01-26T15:25:43.3181913+08:00;True|2026-01-26T15:25:14.6706698+08:00;True|2026-01-26T15:24:20.6134253+08:00;True|2026-01-26T15:23:57.0303408+08:00;True|2026-01-26T15:20:06.4088432+08:00;True|2026-01-26T15:19:31.8076951+08:00;True|2026-01-26T15:14:49.8542368+08:00;</History>
    <History>True|2026-02-27T01:08:33.3985444Z;False|2026-02-27T09:08:11.1491962+08:00;True|2026-02-26T16:55:18.8275449+08:00;True|2026-02-26T16:40:40.3807253+08:00;False|2026-02-26T16:40:03.2172667+08:00;True|2026-02-04T14:14:08.6815293+08:00;True|2026-02-04T14:12:55.3426756+08:00;True|2026-02-04T14:06:04.8563633+08:00;True|2026-02-04T13:59:45.8674762+08:00;True|2026-02-04T13:59:40.8476722+08:00;True|2026-02-04T13:49:27.8178193+08:00;True|2026-02-04T13:47:17.9531917+08:00;True|2026-02-04T13:33:13.4905042+08:00;True|2026-02-04T11:13:26.7587124+08:00;True|2026-02-04T10:44:11.8398866+08:00;True|2026-02-04T10:37:30.4140022+08:00;True|2026-02-04T10:10:15.2756301+08:00;True|2026-02-04T10:06:43.8401980+08:00;True|2026-02-04T09:43:16.4168165+08:00;True|2026-02-04T09:38:57.6155453+08:00;True|2026-02-04T09:36:23.7275649+08:00;True|2026-02-04T09:18:39.5157535+08:00;True|2026-02-04T08:55:39.8422012+08:00;True|2026-02-04T08:50:53.2493857+08:00;True|2026-02-04T08:49:13.6401738+08:00;True|2026-02-04T08:47:44.4063649+08:00;True|2026-02-04T08:27:35.3397920+08:00;True|2026-02-04T08:11:10.8455212+08:00;False|2026-02-04T08:10:46.8065171+08:00;True|2026-02-03T11:17:54.1264839+08:00;True|2026-02-03T11:13:07.3503801+08:00;True|2026-02-03T10:57:22.0499756+08:00;True|2026-02-03T10:49:51.5729577+08:00;False|2026-02-03T10:49:34.3419439+08:00;True|2026-02-02T16:46:50.4584549+08:00;True|2026-02-02T16:42:58.9718820+08:00;True|2026-02-02T16:37:04.3367393+08:00;True|2026-02-02T16:25:15.8758401+08:00;True|2026-02-02T16:23:39.5355352+08:00;False|2026-02-02T16:22:23.6470725+08:00;True|2026-01-27T14:38:42.1847305+08:00;True|2026-01-27T14:35:31.4859936+08:00;True|2026-01-27T14:18:36.2122726+08:00;True|2026-01-27T14:03:03.8424130+08:00;True|2026-01-27T13:14:23.0197795+08:00;True|2026-01-27T11:26:12.7603302+08:00;True|2026-01-27T11:23:11.2980950+08:00;True|2026-01-27T11:17:42.7742881+08:00;True|2026-01-27T10:27:13.8894331+08:00;True|2026-01-27T10:22:33.6468907+08:00;True|2026-01-27T10:13:18.5553398+08:00;False|2026-01-27T10:10:23.9320618+08:00;True|2026-01-27T10:00:58.3355300+08:00;False|2026-01-27T10:00:37.4820904+08:00;True|2026-01-27T09:45:12.8813559+08:00;True|2026-01-27T09:41:43.1787804+08:00;True|2026-01-27T09:40:22.3478291+08:00;True|2026-01-27T09:39:19.6165154+08:00;True|2026-01-27T09:37:31.7523727+08:00;True|2026-01-27T08:33:15.6345855+08:00;True|2026-01-27T08:25:27.8955175+08:00;False|2026-01-27T08:24:59.4512268+08:00;True|2026-01-26T16:40:38.8412768+08:00;True|2026-01-26T16:16:41.7932895+08:00;True|2026-01-26T16:15:35.4808695+08:00;True|2026-01-26T16:08:19.1707669+08:00;True|2026-01-26T16:07:38.4808637+08:00;True|2026-01-26T16:00:28.5139031+08:00;True|2026-01-26T15:56:20.5415856+08:00;True|2026-01-26T15:47:55.9662192+08:00;True|2026-01-26T15:40:45.2534281+08:00;True|2026-01-26T15:39:09.6931174+08:00;True|2026-01-26T15:37:51.9154771+08:00;True|2026-01-26T15:33:35.6039826+08:00;True|2026-01-26T15:31:52.9425047+08:00;True|2026-01-26T15:30:45.3923302+08:00;True|2026-01-26T15:29:05.0429905+08:00;True|2026-01-26T15:27:05.4558977+08:00;True|2026-01-26T15:26:29.2629885+08:00;True|2026-01-26T15:25:43.3181913+08:00;True|2026-01-26T15:25:14.6706698+08:00;True|2026-01-26T15:24:20.6134253+08:00;True|2026-01-26T15:23:57.0303408+08:00;True|2026-01-26T15:20:06.4088432+08:00;True|2026-01-26T15:19:31.8076951+08:00;True|2026-01-26T15:14:49.8542368+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/04/2026 14:05:56</publishTime>
      <publishTime>02/26/2026 16:40:23</publishTime>
    </File>
    <File Include="bin/BLL.pdb">
      <publishTime>02/04/2026 14:05:56</publishTime>
      <publishTime>02/26/2026 16:40:23</publishTime>
    </File>
    <File Include="bin/BouncyCastle.Crypto.dll">
      <publishTime>12/18/2020 05:32:28</publishTime>
    </File>
    <File Include="bin/DAL.dll">
      <publishTime>02/04/2026 14:05:54</publishTime>
      <publishTime>02/26/2026 16:40:20</publishTime>
    </File>
    <File Include="bin/DAL.pdb">
      <publishTime>02/04/2026 14:05:54</publishTime>
      <publishTime>02/26/2026 16:40:20</publishTime>
    </File>
    <File Include="bin/Dapper.dll">
      <publishTime>07/22/2016 22:52:40</publishTime>
    </File>
    <File Include="bin/DBUtility.dll">
      <publishTime>02/02/2026 16:23:19</publishTime>
      <publishTime>02/26/2026 16:40:15</publishTime>
    </File>
    <File Include="bin/DBUtility.pdb">
      <publishTime>02/02/2026 16:23:19</publishTime>
      <publishTime>02/26/2026 16:40:15</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/03/2026 10:57:09</publishTime>
      <publishTime>02/26/2026 16:40:17</publishTime>
    </File>
    <File Include="bin/Model.pdb">
      <publishTime>02/03/2026 10:57:09</publishTime>
      <publishTime>02/26/2026 16:40:17</publishTime>
    </File>
    <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
      <publishTime>11/12/2025 10:43:47</publishTime>
@@ -177,34 +177,34 @@
      <publishTime>11/13/2012 12:19:34</publishTime>
    </File>
    <File Include="bin/Pub_Class.dll">
      <publishTime>02/02/2026 16:23:17</publishTime>
      <publishTime>02/04/2026 18:25:40</publishTime>
    </File>
    <File Include="bin/Pub_Class.pdb">
      <publishTime>02/02/2026 16:23:17</publishTime>
      <publishTime>02/04/2026 18:25:40</publishTime>
    </File>
    <File Include="bin/Pub_Control.dll">
      <publishTime>02/02/2026 16:23:18</publishTime>
      <publishTime>02/04/2026 18:25:42</publishTime>
    </File>
    <File Include="bin/Pub_Control.pdb">
      <publishTime>02/02/2026 16:23:18</publishTime>
      <publishTime>02/04/2026 18:25:42</publishTime>
    </File>
    <File Include="bin/RestSharp.dll">
      <publishTime>08/31/2012 06:22:50</publishTime>
    </File>
    <File Include="bin/SQLHelper.dll">
      <publishTime>02/02/2026 16:23:18</publishTime>
      <publishTime>02/06/2026 14:30:52</publishTime>
    </File>
    <File Include="bin/SQLHelper.pdb">
      <publishTime>02/02/2026 16:23:18</publishTime>
      <publishTime>02/06/2026 14:30:52</publishTime>
    </File>
    <File Include="bin/Swashbuckle.Core.dll">
      <publishTime>02/16/2015 01:57:08</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.dll">
      <publishTime>01/19/2026 15:35:44</publishTime>
      <publishTime>02/04/2026 18:16:05</publishTime>
    </File>
    <File Include="bin/SyntacticSugar.pdb">
      <publishTime>01/19/2026 15:35:44</publishTime>
      <publishTime>02/04/2026 18:16:05</publishTime>
    </File>
    <File Include="bin/System.Buffers.dll">
      <publishTime>07/19/2017 18:01:28</publishTime>
@@ -315,22 +315,22 @@
      <publishTime>05/09/2023 10:43:40</publishTime>
    </File>
    <File Include="bin/TopSdk.dll">
      <publishTime>01/27/2026 14:47:22</publishTime>
      <publishTime>02/04/2026 16:46:28</publishTime>
    </File>
    <File Include="bin/TopSdk.pdb">
      <publishTime>01/27/2026 14:47:22</publishTime>
      <publishTime>02/04/2026 16:46:28</publishTime>
    </File>
    <File Include="bin/WebActivatorEx.dll">
      <publishTime>11/24/2014 19:18:48</publishTime>
    </File>
    <File Include="bin/WebAPI.dll">
      <publishTime>02/04/2026 14:14:04</publishTime>
      <publishTime>02/27/2026 09:08:26</publishTime>
    </File>
    <File Include="bin/WebAPI.pdb">
      <publishTime>02/04/2026 14:14:04</publishTime>
      <publishTime>02/27/2026 09:08:26</publishTime>
    </File>
    <File Include="bin/WebAPI.XmlSerializers.dll">
      <publishTime>02/04/2026 14:14:07</publishTime>
      <publishTime>02/27/2026 09:08:31</publishTime>
    </File>
    <File Include="bin/WebGrease.dll">
      <publishTime>07/18/2013 01:03:52</publishTime>
@@ -435,16 +435,16 @@
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="packages.config">
      <publishTime>01/27/2026 08:36:04</publishTime>
      <publishTime>02/04/2026 16:46:28</publishTime>
    </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">
      <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>01/27/2026 08:35:50</publishTime>
      <publishTime>02/04/2026 16:46:28</publishTime>
    </File>
    <File Include="Template/barCodeTemplateStorage.json">
      <publishTime>11/12/2025 10:43:47</publishTime>
@@ -555,7 +555,7 @@
      <publishTime>11/12/2025 10:43:47</publishTime>
    </File>
    <File Include="Web.config">
      <publishTime>02/02/2026 16:23:36</publishTime>
      <publishTime>02/26/2026 16:40:38</publishTime>
    </File>
  </ItemGroup>
</Project>