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/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MOM/RequestEqptRunDto.cs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MOM/RequestEqptRunDto.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MOM/RequestEqptRunDto.cs
index d15c463..0cac9cd 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MOM/RequestEqptRunDto.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/MOM/RequestEqptRunDto.cs
@@ -18,4 +18,4 @@
         /// </summary>
         public string EquipmentModel { get; set; }
     }
-}
\ No newline at end of file
+}

--
Gitblit v1.9.3