From 89873b7d156f21e7aa71b3f004a11ced2e7a7d4e Mon Sep 17 00:00:00 2001 From: yusijie <ysj@hz-kingdee.com> Date: 星期五, 29 十一月 2024 09:28:55 +0800 Subject: [PATCH] 日计划导入限制 --- SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt index b4b65b7..f54f2f9 100644 --- a/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt +++ b/SyntacticSugar/obj/Debug/SyntacticSugar.csproj.FileListAbsolute.txt @@ -1,6 +1,15 @@ -D:\GIT浠撳簱\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll -D:\GIT浠撳簱\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb -D:\GIT浠撳簱\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache -D:\GIT浠撳簱\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache -D:\GIT浠撳簱\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll -D:\GIT浠撳簱\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb +<<<<<<< HEAD +D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll +D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb +D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache +D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll +D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb +D:\缃戠珯鍙戝竷\鍚庣浠ｇ爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache +======= +C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.dll +C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\bin\Debug\SyntacticSugar.pdb +C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.CoreCompileInputs.cache +C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.dll +C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.pdb +C:\Users\86130\Desktop\鏅轰簯杩堟�漒MES-WEB-API\SyntacticSugar\obj\Debug\SyntacticSugar.csproj.AssemblyReference.cache +>>>>>>> 3a1239dbd6e9cce019acaae934f1675298ef8a06 -- Gitblit v1.9.1