From b4fb87eceedef213a602afa59aeb104a0c6c08d7 Mon Sep 17 00:00:00 2001 From: 刘磊 <1161824510@qq.com> Date: 星期二, 19 十一月 2024 10:15:34 +0800 Subject: [PATCH] 同步 --- .gitignore | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index ee06d2c..bc0e715 100644 --- a/.gitignore +++ b/.gitignore @@ -1066,6 +1066,13 @@ /Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/Debug/net6.0/WIDESEA_Tasks.csproj.CoreCompileInputs.cache /Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/project.nuget.cache /Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/WIDESEA_Tasks.csproj.nuget.dgspec.json +<<<<<<< HEAD +/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/Logs/202411/鎶ユ枃.docx +/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json +/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/appsettings.json +/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json +/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Debug/net6.0/appsettings.json +======= /Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/project.assets.json /Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/project.nuget.cache /Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/WIDESEAWCS_BasicInfoRepository.csproj.nuget.dgspec.json @@ -1225,3 +1232,13 @@ /Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.CoreCompileInputs.cache /Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.FileListAbsolute.txt /Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs +>>>>>>> 2c4c125072e1b88c994efc9bb6f1ff5ef754d41b +/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/鑰佸寲鍏ュ簱杈撻�佺嚎/Logs_20241115153036.txt +/Code Management/WMS/WIDESEA_WMSServer/LogLibrary/obj/Debug/net6.0/LogLibrary.GeneratedMSBuildEditorConfig.editorconfig +/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Debug/net6.0/WIDESEA_IStoragIntegrationServices.GeneratedMSBuildEditorConfig.editorconfig +/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/Debug/net6.0/WIDESEA_Tasks.GeneratedMSBuildEditorConfig.editorconfig +*.txt +/Code Management/WCS/WIDESEAWCS_Client/yarn.lock +/Code Management/WCS/WIDESEAWCS_Client/package-lock.json +/Code Management/WMS/WIDESEA_WMSClient/src/api/http.js +/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs -- Gitblit v1.9.3