From 597cca93854339e7b7df7e516a75d0d4936faea7 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期一, 23 十二月 2024 21:04:09 +0800
Subject: [PATCH] 1
---
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e8a69a95-d256-4664-a68b-3579d7c901f3.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c6122441-2f23-4566-894d-2438c126bfa0.vsidx | 0
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/b38bf002-812b-4b12-b991-24b69f011aa6.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs | 3 +++
代码管理/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/1030e901-57d8-49d3-8577-b4454b655f2c.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7ab5e54f-e15f-4070-8b63-2b0d6e70b364.vsidx | 0
6 files changed, 3 insertions(+), 0 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/1030e901-57d8-49d3-8577-b4454b655f2c.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/1030e901-57d8-49d3-8577-b4454b655f2c.vsidx"
new file mode 100644
index 0000000..8b56de7
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/1030e901-57d8-49d3-8577-b4454b655f2c.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/b38bf002-812b-4b12-b991-24b69f011aa6.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/b38bf002-812b-4b12-b991-24b69f011aa6.vsidx"
new file mode 100644
index 0000000..39180e0
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/b38bf002-812b-4b12-b991-24b69f011aa6.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7ab5e54f-e15f-4070-8b63-2b0d6e70b364.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7ab5e54f-e15f-4070-8b63-2b0d6e70b364.vsidx"
new file mode 100644
index 0000000..b3fbf09
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7ab5e54f-e15f-4070-8b63-2b0d6e70b364.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c6122441-2f23-4566-894d-2438c126bfa0.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c6122441-2f23-4566-894d-2438c126bfa0.vsidx"
new file mode 100644
index 0000000..70aef67
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c6122441-2f23-4566-894d-2438c126bfa0.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e8a69a95-d256-4664-a68b-3579d7c901f3.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e8a69a95-d256-4664-a68b-3579d7c901f3.vsidx"
new file mode 100644
index 0000000..f165ae6
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e8a69a95-d256-4664-a68b-3579d7c901f3.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
index e0ff5c3..12ac797 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs"
@@ -95,6 +95,7 @@
WebResponseContent OutboundTaskCompleted(int taskNum);
/// <summary>
+<<<<<<< Updated upstream
/// 娴嬭瘯鏋堕��搴�
/// </summary>
/// <param name="backModel"></param>
@@ -102,6 +103,8 @@
MesResponseContent TestReturnStock(TestToolBackModel backModel);
/// <summary>
+=======
+>>>>>>> Stashed changes
/// 鍒ゆ柇鏄惁闇�瑕佺Щ搴�
/// </summary>
/// <param name="taskNum">浠诲姟鍙�</param>
--
Gitblit v1.9.3