From e4599e82ba0d23dc30eb86c196a37a7e11647a86 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 23 十二月 2024 16:10:39 +0800
Subject: [PATCH] 条码生成:销售出库单 作为源单时,设备仓库信息

---
 SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
index 631be78..39f077b 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,6 +1,13 @@
-D:\vs\椤圭洰浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
-D:\vs\椤圭洰浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
-D:\vs\椤圭洰浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
-D:\vs\椤圭洰浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
-D:\vs\椤圭洰浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
-D:\vs\椤圭洰浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
+<<<<<<< HEAD
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
+E:\鏅轰簯mes\mes\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
+=======
+D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
+D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
+D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
+D:\缃戠珯鍙戝竷\鍚庣浠g爜\MES-WEB-API\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
+>>>>>>> ba76af92c90c52823b8140ac3be26fbf69d467bd

--
Gitblit v1.9.1