From e474610c782361c10a474a2fe1fd889aaa267d7e Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 09 三月 2026 10:36:19 +0800
Subject: [PATCH] 新增 多语言可配置项 获取多语言的时候,可以从数据库中选取配置项来控制使用启用远程多语言功能

---
 SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
index 7466352..b04ef31 100644
--- a/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
+++ b/SyntacticSugar/obj/Release/SyntacticSugar.csproj.FileListAbsolute.txt
@@ -1,19 +1,15 @@
-<<<<<<< HEAD
 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
-=======
 D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
 D:\WorkBench\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
 D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
 D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
 D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
-D:\WorkBench\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.AssemblyReference.cache
 D:\WMES\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.dll
 D:\WMES\MES-WEB-API\SyntacticSugar\bin\Release\SyntacticSugar.pdb
 D:\WMES\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.csproj.CoreCompileInputs.cache
 D:\WMES\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.dll
 D:\WMES\MES-WEB-API\SyntacticSugar\obj\Release\SyntacticSugar.pdb
->>>>>>> 9ff424751d75ebba92f8317bd2d6aa57094baca4

--
Gitblit v1.9.1