From 58a5a9af83492c5bbb4fba88b4443f08fa4becfc Mon Sep 17 00:00:00 2001
From: 刘磊 <1161824510@qq.com>
Date: 星期二, 17 十二月 2024 19:53:14 +0800
Subject: [PATCH] 解决冲突
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IDt_StationManagerService.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IDt_StationManagerService.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IDt_StationManagerService.cs
index a171972..423e7d1 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IDt_StationManagerService.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IDt_StationManagerService.cs
@@ -25,7 +25,7 @@
public interface IDt_StationManagerService : IService<Dt_StationManager>
{
/// <summary>
- /// 鏍规嵁PLC璁惧鑾峰彇褰撳墠璁惧涓嬬殑鎵�鏈夌珯鍙�
+ /// 鏍规嵁PLC璁惧鑾峰彇褰撳墠璁惧涓嬬殑鎵�鏈夊惎鐢ㄧ殑绔欏彴
/// </summary>
/// <param name="DeviceCode"></param>
/// <returns></returns>
@@ -33,7 +33,7 @@
/// <summary>
- /// 鏍规嵁瀛愯澶囩紪鍙峰拰鍖哄煙 鑾峰彇绔欏彴
+ /// 鏍规嵁瀛愯澶囩紪鍙峰拰鍖哄煙 鑾峰彇鍚敤鐨勭珯鍙�
/// </summary>
/// <param name="ChildCode"></param>
/// <param name="area"></param>
--
Gitblit v1.9.3