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_Server/Controllers/Telescopic/MaintenanceController.cs | 20 ++------------------
1 files changed, 2 insertions(+), 18 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs"
index 47a912f..3508240 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs"
@@ -23,17 +23,10 @@
/// 鏌ョ湅妫�淇鐞�
/// </summary>
/// <returns></returns>
-<<<<<<< Updated upstream
- [HttpGet,Route("ShowMaintence"),AllowAnonymous]
- public WebResponseContent ShowMaintence()
- {
- return Service.ShowMaintence();
-=======
[HttpPost,Route("ShowMaintence"),AllowAnonymous]
public WebResponseContent ShowMaintence([FromBody] PaginationDTO pagination)
{
return Service.ShowMaintence(pagination);
->>>>>>> Stashed changes
}
/// <summary>
@@ -41,15 +34,9 @@
/// </summary>
/// <returns></returns>
[HttpPost, Route("PersonnelMonitoring"), AllowAnonymous]
-<<<<<<< Updated upstream
- public WebResponseContent PersonnelMonitoring(bool ispossible)
- {
- return Service.PersonnelMonitoring(ispossible);
-=======
public WebResponseContent PersonnelMonitoring([FromBody] PaginationDTO pagination)
{
return Service.PersonnelMonitoring(pagination);
->>>>>>> Stashed changes
}
@@ -59,9 +46,9 @@
/// <param name="id"></param>
/// <returns></returns>
[HttpPost,Route("RunOperation"), AllowAnonymous]
- public WebResponseContent RunOperation(int id)
+ public WebResponseContent RunOperation(int id, string ispossible)
{
- return Service.RunOperation(id);
+ return Service.RunOperation(id,ispossible);
}
/// <summary>
@@ -74,8 +61,6 @@
{
return Service.ChangeTasState(id);
}
-<<<<<<< Updated upstream
-=======
/// <summary>
@@ -87,6 +72,5 @@
{
return Service.MaintenanceOperationRecord(pagination);
}
->>>>>>> Stashed changes
}
}
--
Gitblit v1.9.3