From 2d4e07b5d61490d3c3cfeb398d3d6e4b6f8be9bb Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期五, 28 三月 2025 09:28:18 +0800
Subject: [PATCH] 111

---
 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceService.cs |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceService.cs"
index ad2608b..5a817d2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceService.cs"
@@ -6,6 +6,7 @@
 using WIDESEAWCS_Core;
 using WIDESEAWCS_Core.BaseRepository;
 using WIDESEAWCS_Core.BaseServices;
+using WIDESEAWCS_DTO.Telescopic;
 using WIDESEAWCS_Model.Models;
 
 namespace WIDESEAWCS_ITelescopicService
@@ -18,13 +19,21 @@
        /// 璁剧疆妫�淇潈闄�
        /// </summary>
        /// <returns></returns>
+<<<<<<< Updated upstream
         WebResponseContent ShowMaintence();
+=======
+        WebResponseContent ShowMaintence(PaginationDTO pagination);
+>>>>>>> Stashed changes
 
         /// <summary>
         /// 鍦ㄦ淇汉鍛樼洃鎺�
         /// </summary>
         /// <returns></returns>
+<<<<<<< Updated upstream
         WebResponseContent PersonnelMonitoring(bool ispossible);
+=======
+        WebResponseContent PersonnelMonitoring(PaginationDTO pagination);
+>>>>>>> Stashed changes
 
         /// <summary>
         /// 鏇存敼鐘舵�侊紝杩愯杩涘叆妫�淇�
@@ -35,6 +44,15 @@
 
         WebResponseContent ChangeTasState(int id);
 
+<<<<<<< Updated upstream
+=======
+        /// <summary>
+        /// 妫�淇搷浣滆褰�
+        /// </summary>
+        /// <returns></returns>
+        WebResponseContent MaintenanceOperationRecord(PaginationDTO pagination);
+
+>>>>>>> Stashed changes
     }
 
    

--
Gitblit v1.9.3