From f510c6405f7854fa0ab6bf92e72ea15dde056f4c Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 03 三月 2026 16:21:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user | 87 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 84 insertions(+), 3 deletions(-)
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
index 80add10..27fed20 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile2.pubxml.user
@@ -5,7 +5,11 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\API</_PublishTargetUrl>
+<<<<<<< HEAD
+ <History>False|2026-01-27T03:12:53.2956463Z;True|2026-01-13T09:47:37.1289215+08:00;False|2026-01-12T09:27:01.9297704+08:00;True|2026-01-11T14:27:58.9407325+08:00;False|2026-01-11T14:26:47.1324504+08:00;True|2026-01-11T13:54:38.7697615+08:00;True|2026-01-11T12:39:56.1396008+08:00;False|2026-01-11T12:37:59.5059421+08:00;True|2026-01-09T15:34:00.7959753+08:00;False|2026-01-09T15:32:33.3223847+08:00;True|2026-01-09T10:27:04.4418230+08:00;False|2026-01-09T10:24:55.6104648+08:00;True|2026-01-08T18:05:09.8950096+08:00;False|2026-01-08T18:03:49.6828377+08:00;True|2026-01-08T15:53:31.8458993+08:00;True|2026-01-08T15:43:35.4452984+08:00;True|2026-01-08T15:16:09.2797564+08:00;True|2026-01-08T15:09:12.1761272+08:00;False|2026-01-08T15:08:31.8053125+08:00;True|2026-01-08T12:28:32.3839432+08:00;False|2026-01-08T12:28:06.4930402+08:00;False|2026-01-06T13:05:41.4537127+08:00;True|2026-01-04T11:27:03.6003486+08:00;True|2026-01-04T11:16:09.0856233+08:00;True|2026-01-04T11:09:33.9721372+08:00;True|2026-01-04T10:59:57.5111892+08:00;False|2026-01-04T10:57:57.5312203+08:00;True|2025-12-30T14:23:14.0889784+08:00;True|2025-12-29T09:12:05.7081903+08:00;False|2025-12-29T09:11:27.9082848+08:00;True|2025-07-01T16:53:57.8492332+08:00;True|2025-07-01T16:14:28.8419744+08:00;True|2025-07-01T15:15:43.3121091+08:00;True|2025-07-01T14:48:00.3454856+08:00;True|2025-07-01T09:17:46.2541717+08:00;False|2025-07-01T09:17:07.0648196+08:00;True|2025-06-23T14:30:28.6691264+08:00;False|2025-06-23T14:27:45.6002040+08:00;True|2025-06-23T11:02:08.3020700+08:00;True|2025-06-23T10:47:44.4654541+08:00;True|2025-06-23T09:46:24.9049910+08:00;False|2025-06-23T09:45:40.5195919+08:00;True|2025-06-20T14:33:10.9210583+08:00;True|2025-06-20T13:22:54.5321865+08:00;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
+=======
<History>True|2026-02-27T09:00:03.2447893Z;True|2026-02-27T14:26:49.0714379+08:00;True|2026-02-27T13:57:50.9161682+08:00;False|2026-02-27T13:54:58.3092086+08:00;True|2026-02-26T16:30:22.6331887+08:00;True|2026-02-26T15:56:54.4778359+08:00;False|2026-02-26T15:55:53.2808802+08:00;False|2026-02-26T15:55:27.7501008+08:00;True|2026-02-26T12:42:10.3734658+08:00;True|2026-02-26T12:01:13.4363491+08:00;True|2026-02-26T10:24:02.2555254+08:00;True|2026-02-03T11:56:14.3086755+08:00;True|2026-02-03T11:51:19.6091315+08:00;True|2026-02-03T10:42:35.4774950+08:00;False|2026-02-03T10:40:57.1735351+08:00;True|2026-02-03T09:30:22.5235073+08:00;False|2026-02-03T09:27:21.6917147+08:00;True|2026-02-02T15:31:07.3762944+08:00;True|2026-02-02T14:13:20.5690146+08:00;True|2026-02-02T10:42:22.4804584+08:00;False|2026-02-02T10:41:48.7402434+08:00;True|2026-02-01T17:40:21.0538069+08:00;True|2026-02-01T15:44:12.2393909+08:00;False|2026-02-01T15:40:37.6456544+08:00;True|2026-01-31T12:05:50.6946479+08:00;False|2026-01-31T12:04:44.5273342+08:00;True|2026-01-29T17:14:07.3795568+08:00;True|2026-01-29T17:11:48.4286289+08:00;True|2026-01-29T16:10:42.7141082+08:00;True|2026-01-29T14:41:38.0583611+08:00;True|2026-01-29T14:36:18.1975177+08:00;True|2026-01-29T14:34:43.7423264+08:00;True|2026-01-29T14:09:16.2701844+08:00;True|2026-01-29T13:17:37.0708838+08:00;True|2026-01-29T10:21:51.3074443+08:00;False|2026-01-29T10:20:12.1418198+08:00;True|2026-01-28T13:52:59.2210650+08:00;True|2026-01-28T10:34:06.8152564+08:00;False|2026-01-28T10:32:51.4478083+08:00;True|2026-01-27T12:19:58.2090999+08:00;True|2026-01-27T12:18:40.9255150+08:00;True|2026-01-27T12:10:45.0784359+08:00;True|2026-01-27T11:45:58.2218602+08:00;True|2026-01-27T08:54:11.2473398+08:00;False|2026-01-27T08:50:52.3900508+08:00;True|2026-01-25T16:51:10.8469862+08:00;True|2026-01-25T16:15:55.3063785+08:00;False|2026-01-25T16:13:47.1609576+08:00;False|2026-01-25T16:10:27.3797138+08:00;True|2026-01-22T19:26:11.1120981+08:00;False|2026-01-22T19:21:59.7591077+08:00;True|2026-01-21T20:10:38.2264542+08:00;True|2026-01-21T20:05:52.6769930+08:00;False|2026-01-21T20:04:52.2864808+08:00;True|2026-01-20T10:09:22.6558754+08:00;True|2026-01-20T09:43:16.9535139+08:00;False|2026-01-20T09:40:14.5080297+08:00;True|2026-01-19T17:23:36.9963060+08:00;True|2026-01-19T17:18:41.7602029+08:00;True|2026-01-19T17:05:35.1663057+08:00;True|2026-01-19T16:49:48.9497194+08:00;True|2026-01-19T12:35:09.4063486+08:00;False|2026-01-19T12:33:25.3260660+08:00;True|2026-01-17T20:21:42.3497625+08:00;True|2026-01-17T20:17:40.8631870+08:00;True|2026-01-17T20:13:16.6618986+08:00;False|2026-01-17T20:10:39.7099356+08:00;False|2026-01-17T20:10:01.5198461+08:00;False|2026-01-17T20:09:07.5632818+08:00;True|2026-01-17T20:06:07.7085249+08:00;True|2026-01-17T17:50:38.6295526+08:00;False|2026-01-17T17:48:59.9531552+08:00;True|2026-01-16T16:22:22.3525933+08:00;True|2026-01-16T14:14:39.4187185+08:00;False|2026-01-16T14:10:47.6350779+08:00;True|2026-01-15T17:33:04.8867687+08:00;True|2026-01-15T17:13:07.4827420+08:00;False|2026-01-15T17:11:32.8298249+08:00;True|2026-01-15T16:34:04.8984638+08:00;True|2026-01-15T14:12:39.3677563+08:00;False|2026-01-15T14:10:25.0842475+08:00;True|2026-01-14T19:47:01.2486856+08:00;False|2026-01-14T19:46:15.5380497+08:00;True|2026-01-14T15:49:22.6528911+08:00;True|2026-01-14T10:24:06.5942562+08:00;False|2026-01-14T10:22:32.4884475+08:00;False|2026-01-12T09:27:01.9297704+08:00;True|2026-01-11T14:27:58.9407325+08:00;False|2026-01-11T14:26:47.1324504+08:00;True|2026-01-11T13:54:38.7697615+08:00;True|2026-01-11T12:39:56.1396008+08:00;False|2026-01-11T12:37:59.5059421+08:00;True|2026-01-09T15:34:00.7959753+08:00;False|2026-01-09T15:32:33.3223847+08:00;True|2026-01-09T10:27:04.4418230+08:00;False|2026-01-09T10:24:55.6104648+08:00;True|2026-01-08T18:05:09.8950096+08:00;False|2026-01-08T18:03:49.6828377+08:00;True|2026-01-08T15:53:31.8458993+08:00;True|2026-01-08T15:43:35.4452984+08:00;True|2026-01-08T15:16:09.2797564+08:00;True|2026-01-08T15:09:12.1761272+08:00;False|2026-01-08T15:08:31.8053125+08:00;True|2026-01-08T12:28:32.3839432+08:00;False|2026-01-08T12:28:06.4930402+08:00;False|2026-01-06T13:05:41.4537127+08:00;True|2026-01-04T11:27:03.6003486+08:00;True|2026-01-04T11:16:09.0856233+08:00;True|2026-01-04T11:09:33.9721372+08:00;True|2026-01-04T10:59:57.5111892+08:00;False|2026-01-04T10:57:57.5312203+08:00;True|2025-12-30T14:23:14.0889784+08:00;True|2025-12-29T09:12:05.7081903+08:00;False|2025-12-29T09:11:27.9082848+08:00;True|2025-07-01T16:53:57.8492332+08:00;True|2025-07-01T16:14:28.8419744+08:00;True|2025-07-01T15:15:43.3121091+08:00;True|2025-07-01T14:48:00.3454856+08:00;True|2025-07-01T09:17:46.2541717+08:00;False|2025-07-01T09:17:07.0648196+08:00;True|2025-06-23T14:30:28.6691264+08:00;False|2025-06-23T14:27:45.6002040+08:00;True|2025-06-23T11:02:08.3020700+08:00;True|2025-06-23T10:47:44.4654541+08:00;True|2025-06-23T09:46:24.9049910+08:00;False|2025-06-23T09:45:40.5195919+08:00;True|2025-06-20T14:33:10.9210583+08:00;True|2025-06-20T13:22:54.5321865+08:00;False|2025-06-20T13:21:30.8643897+08:00;True|2025-06-20T08:36:32.6695266+08:00;False|2025-06-20T08:35:57.8274069+08:00;True|2025-06-19T08:14:35.0623669+08:00;False|2025-06-19T08:12:57.2451557+08:00;True|2025-06-18T16:56:03.4555368+08:00;True|2025-06-18T16:42:43.2441845+08:00;False|2025-06-18T16:42:02.6907205+08:00;True|2025-06-16T16:13:03.2956026+08:00;False|2025-06-16T16:12:23.8438917+08:00;True|2025-06-16T15:21:32.7370852+08:00;True|2025-06-16T15:08:57.7166003+08:00;True|2025-06-16T14:02:18.4224630+08:00;True|2025-06-16T11:00:03.6375429+08:00;False|2025-06-16T10:59:26.0956296+08:00;True|2025-06-09T16:45:52.0865612+08:00;True|2025-06-09T16:38:47.2182194+08:00;True|2025-06-09T16:17:50.9170601+08:00;False|2025-06-09T16:17:43.0333396+08:00;True|2025-06-09T15:25:17.0429161+08:00;True|2025-06-09T15:00:15.0058791+08:00;True|2025-06-09T14:50:02.1370115+08:00;True|2025-06-09T14:38:10.9037045+08:00;True|2025-06-09T14:34:53.2826267+08:00;True|2025-06-09T14:07:24.5341951+08:00;True|2025-06-09T13:39:17.5042542+08:00;True|2025-06-09T09:30:31.8197114+08:00;True|2025-01-10T13:10:47.2046185+08:00;True|2025-01-10T11:11:49.4016910+08:00;True|2025-01-10T10:59:12.3481721+08:00;False|2025-01-10T10:58:24.5033898+08:00;True|2025-01-04T14:35:42.2792864+08:00;</History>
+>>>>>>> b2e18e3fc0735edf1fc378936c81e5971bc52f61
</PropertyGroup>
<ItemGroup>
<File Include="apiapp.json">
@@ -45,40 +49,61 @@
<publishTime>02/22/2013 16:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
+<<<<<<< HEAD
+ <publishTime>01/27/2026 11:11:38</publishTime>
+ </File>
+ <File Include="bin/BLL.pdb">
+ <publishTime>01/27/2026 11:11:38</publishTime>
+=======
<publishTime>02/27/2026 16:59:04</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>02/27/2026 16:59:04</publishTime>
+>>>>>>> b2e18e3fc0735edf1fc378936c81e5971bc52f61
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
</File>
<File Include="bin/DAL.dll">
+<<<<<<< HEAD
+ <publishTime>01/27/2026 11:11:36</publishTime>
+ </File>
+ <File Include="bin/DAL.pdb">
+ <publishTime>01/27/2026 11:11:36</publishTime>
+=======
<publishTime>02/27/2026 16:58:54</publishTime>
</File>
<File Include="bin/DAL.pdb">
<publishTime>02/27/2026 16:58:54</publishTime>
+>>>>>>> b2e18e3fc0735edf1fc378936c81e5971bc52f61
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 22:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
+<<<<<<< HEAD
+ <publishTime>01/27/2026 11:11:32</publishTime>
+ </File>
+ <File Include="bin/DBUtility.pdb">
+ <publishTime>01/27/2026 11:11:32</publishTime>
+=======
<publishTime>02/27/2026 14:26:28</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
<publishTime>02/27/2026 14:26:28</publishTime>
+>>>>>>> b2e18e3fc0735edf1fc378936c81e5971bc52f61
</File>
<File Include="bin/Fleck.dll">
<publishTime>04/22/2021 11:48:12</publishTime>
</File>
<File Include="bin/GetuiServerApiSDK.dll">
- <publishTime>01/19/2026 18:29:10</publishTime>
+ <publishTime>01/27/2026 10:11:35</publishTime>
</File>
<File Include="bin/GetuiServerApiSDK.dll.config">
- <publishTime>01/19/2026 18:29:10</publishTime>
+ <publishTime>01/27/2026 10:11:35</publishTime>
</File>
<File Include="bin/Google.ProtocolBuffers.dll">
- <publishTime>01/19/2026 18:29:10</publishTime>
+ <publishTime>01/27/2026 10:11:35</publishTime>
</File>
<File Include="bin/Grpc.Core.Api.dll">
<publishTime>03/22/2022 13:17:26</publishTime>
@@ -138,10 +163,17 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
+<<<<<<< HEAD
+ <publishTime>01/27/2026 11:11:33</publishTime>
+ </File>
+ <File Include="bin/Model.pdb">
+ <publishTime>01/27/2026 11:11:33</publishTime>
+=======
<publishTime>02/27/2026 16:58:39</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>02/27/2026 16:58:39</publishTime>
+>>>>>>> b2e18e3fc0735edf1fc378936c81e5971bc52f61
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>05/23/2025 10:00:25</publishTime>
@@ -177,6 +209,18 @@
<publishTime>11/13/2012 20:19:34</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
+<<<<<<< HEAD
+ <publishTime>01/27/2026 11:11:30</publishTime>
+ </File>
+ <File Include="bin/Pub_Class.pdb">
+ <publishTime>01/27/2026 11:11:30</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.dll">
+ <publishTime>01/27/2026 11:11:31</publishTime>
+ </File>
+ <File Include="bin/Pub_Control.pdb">
+ <publishTime>01/27/2026 11:11:31</publishTime>
+=======
<publishTime>02/27/2026 14:26:20</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
@@ -187,24 +231,39 @@
</File>
<File Include="bin/Pub_Control.pdb">
<publishTime>02/27/2026 14:26:24</publishTime>
+>>>>>>> b2e18e3fc0735edf1fc378936c81e5971bc52f61
</File>
<File Include="bin/RestSharp.dll">
<publishTime>08/31/2012 06:22:50</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
+<<<<<<< HEAD
+ <publishTime>01/27/2026 11:11:32</publishTime>
+ </File>
+ <File Include="bin/SQLHelper.pdb">
+ <publishTime>01/27/2026 11:11:32</publishTime>
+=======
<publishTime>02/27/2026 14:26:25</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
<publishTime>02/27/2026 14:26:25</publishTime>
+>>>>>>> b2e18e3fc0735edf1fc378936c81e5971bc52f61
</File>
<File Include="bin/Swashbuckle.Core.dll">
<publishTime>02/16/2015 01:57:08</publishTime>
</File>
<File Include="bin/SyntacticSugar.dll">
+<<<<<<< HEAD
+ <publishTime>01/27/2026 11:11:29</publishTime>
+ </File>
+ <File Include="bin/SyntacticSugar.pdb">
+ <publishTime>01/27/2026 11:11:29</publishTime>
+=======
<publishTime>02/27/2026 14:22:39</publishTime>
</File>
<File Include="bin/SyntacticSugar.pdb">
<publishTime>02/27/2026 14:22:39</publishTime>
+>>>>>>> b2e18e3fc0735edf1fc378936c81e5971bc52f61
</File>
<File Include="bin/System.Buffers.dll">
<publishTime>07/19/2017 18:01:28</publishTime>
@@ -315,19 +374,33 @@
<publishTime>05/09/2023 10:43:40</publishTime>
</File>
<File Include="bin/TopSdk.dll">
+<<<<<<< HEAD
+ <publishTime>01/27/2026 11:11:33</publishTime>
+ </File>
+ <File Include="bin/TopSdk.pdb">
+ <publishTime>01/27/2026 11:11:33</publishTime>
+=======
<publishTime>02/27/2026 14:23:04</publishTime>
</File>
<File Include="bin/TopSdk.pdb">
<publishTime>02/27/2026 14:23:04</publishTime>
+>>>>>>> b2e18e3fc0735edf1fc378936c81e5971bc52f61
</File>
<File Include="bin/WebActivatorEx.dll">
<publishTime>11/24/2014 19:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
+<<<<<<< HEAD
+ <publishTime>01/27/2026 11:11:48</publishTime>
+ </File>
+ <File Include="bin/WebAPI.pdb">
+ <publishTime>01/27/2026 11:11:48</publishTime>
+=======
<publishTime>02/27/2026 16:59:42</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
<publishTime>02/27/2026 16:59:42</publishTime>
+>>>>>>> b2e18e3fc0735edf1fc378936c81e5971bc52f61
</File>
<File Include="bin/WebAPI.XmlSerializers.dll">
<publishTime>07/01/2025 16:53:56</publishTime>
@@ -435,7 +508,11 @@
<publishTime>05/23/2025 10:00:25</publishTime>
</File>
<File Include="packages.config">
+<<<<<<< HEAD
+ <publishTime>01/27/2026 10:11:35</publishTime>
+=======
<publishTime>01/28/2026 14:08:07</publishTime>
+>>>>>>> b2e18e3fc0735edf1fc378936c81e5971bc52f61
</File>
<File Include="Properties/PublishProfiles/JFAPI.pubxml.user">
<publishTime>12/10/2025 17:08:59</publishTime>
@@ -555,7 +632,11 @@
<publishTime>08/21/2025 15:39:37</publishTime>
</File>
<File Include="Web.config">
+<<<<<<< HEAD
+ <publishTime>01/27/2026 11:13:02</publishTime>
+=======
<publishTime>01/29/2026 10:21:49</publishTime>
+>>>>>>> b2e18e3fc0735edf1fc378936c81e5971bc52f61
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1