From 959aa7cefa8f416452444160cdd4edbea2cadae7 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期四, 07 十一月 2024 16:53:45 +0800
Subject: [PATCH] 合并冲突

---
 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicRepository/obj/Release/net6.0/WIDESEA_StorageBasicRepository.AssemblyInfo.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicRepository/obj/Release/net6.0/WIDESEA_StorageBasicRepository.AssemblyInfo.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicRepository/obj/Release/net6.0/WIDESEA_StorageBasicRepository.AssemblyInfo.cs
index c9992f8..a906508 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicRepository/obj/Release/net6.0/WIDESEA_StorageBasicRepository.AssemblyInfo.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicRepository/obj/Release/net6.0/WIDESEA_StorageBasicRepository.AssemblyInfo.cs
@@ -14,7 +14,7 @@
 [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_StorageBasicRepository")]
 [assembly: System.Reflection.AssemblyConfigurationAttribute("Release")]
 [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+798a97899b961baf7099bc3421d3ad926b1298da")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+2187fcbff389c2a7cc799845410580b37abfe921")]
 [assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_StorageBasicRepository")]
 [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_StorageBasicRepository")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]

--
Gitblit v1.9.3