´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/1c240f10-0218-48c9-926f-61cfbc882a70.vsidxBinary files differ
´úÂë¹ÜÀí/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex/b38bf002-812b-4b12-b991-24b69f011aa6.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/17abf4db-5c0e-4dd5-ad61-d8c5dd739130.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/319444dd-52fa-4755-a1f0-6ec8f7d83f7b.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/5edb54ba-ada3-4951-bc21-e88f75c6e921.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7ab5e54f-e15f-4070-8b63-2b0d6e70b364.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/7b08ed57-62e6-4b82-a17f-35d723b5ca5f.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/8164f66c-be5c-498f-a0df-0efcbb2866af.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/9d62c97e-0b1f-4029-a379-1fd657ac5e9d.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/b331756d-c9e2-4038-b5f1-5e812b045d1a.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/bb2b9ab8-c871-4911-b102-fa668a9b7a3f.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c6122441-2f23-4566-894d-2438c126bfa0.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d0b44122-2895-4680-a742-d07a27d8d5a6.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/e8a69a95-d256-4664-a68b-3579d7c901f3.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/f0a2a946-823a-4398-a2c8-4faf4083d4cd.vsidxBinary files differ
´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_ITaskInfoService/ITaskService.cs
@@ -93,14 +93,13 @@ /// <param name="taskNum">ä»»å¡å·</param> /// <returns></returns> WebResponseContent OutboundTaskCompleted(int taskNum); <<<<<<< Updated upstream /// <summary> /// æµè¯æ¶éåº /// </summary> /// <param name="backModel"></param> /// <returns></returns> MesResponseContent TestReturnStock(TestToolBackModel backModel); ======= /// <summary> /// 夿æ¯å¦éè¦ç§»åº @@ -109,6 +108,5 @@ /// <param name="locationCode">å ¥åºæåºåºçè´§ä½å·</param> /// <returns></returns> WebResponseContent IsRelocation(int taskNum, string locationCode); >>>>>>> Stashed changes } }