From 9f0add00d40fc00e039b92b2fb3469394b1a24f5 Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期五, 28 三月 2025 14:28:59 +0800
Subject: [PATCH] 111
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceService.cs | 20 +++++---------------
1 files changed, 5 insertions(+), 15 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 5a817d2..279087c 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"
@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using Microsoft.AspNetCore.JsonPatch.Operations;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.BaseServices;
@@ -16,43 +17,32 @@
IRepository<Dt_Maintenance> Repository { get; }
/// <summary>
- /// 璁剧疆妫�淇潈闄�
+ /// 灞曠ず璁剧疆妫�淇潈闄�
/// </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>
/// 鏇存敼鐘舵�侊紝杩愯杩涘叆妫�淇�
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- WebResponseContent RunOperation(int id);
+ WebResponseContent RunOperation(int id,string ispossible);
WebResponseContent ChangeTasState(int id);
-<<<<<<< Updated upstream
-=======
/// <summary>
/// 妫�淇搷浣滆褰�
/// </summary>
/// <returns></returns>
WebResponseContent MaintenanceOperationRecord(PaginationDTO pagination);
-
->>>>>>> Stashed changes
+
}
--
Gitblit v1.9.3