From 58a5a9af83492c5bbb4fba88b4443f08fa4becfc Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 17 十二月 2024 19:53:14 +0800
Subject: [PATCH] 解决冲突
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/WIDESEA_Common.csproj | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/WIDESEA_Common.csproj b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/WIDESEA_Common.csproj
index 6b6e2fc..d9b9bc4 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/WIDESEA_Common.csproj
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/WIDESEA_Common.csproj
@@ -12,4 +12,12 @@
<None Remove="Location\**" />
</ItemGroup>
+ <ItemGroup>
+ <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\LogLibrary\LogLibrary.csproj" />
+ </ItemGroup>
+
</Project>
--
Gitblit v1.9.3