From 3fec42c6383aa3b8d65f744a93b8a918d7cc6e02 Mon Sep 17 00:00:00 2001 From: duheng <2784771470@qq.com> Date: 星期二, 23 七月 2024 10:15:54 +0800 Subject: [PATCH] 冲突 --- WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj index a6d14a9..8068c03 100644 --- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj +++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj @@ -42,6 +42,7 @@ <ItemGroup> <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" /> + <PackageReference Include="Yw.BLL.Basic.Core" Version="3.2.0" /> <PackageReference Include="Yw.ZipFile.Core" Version="3.0.0" /> </ItemGroup> -- Gitblit v1.9.3