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_Server/Controllers/Telescopic/MaintenanceController.cs | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 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 c6ff046..47a912f 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"
@@ -3,6 +3,7 @@
using Microsoft.AspNetCore.Mvc;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseController;
+using WIDESEAWCS_DTO.Telescopic;
using WIDESEAWCS_ITelescopicService;
using WIDESEAWCS_IWMSPart;
using WIDESEAWCS_Model.Models;
@@ -22,10 +23,17 @@
/// 鏌ョ湅妫�淇鐞�
/// </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>
@@ -33,9 +41,15 @@
/// </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
}
@@ -60,5 +74,19 @@
{
return Service.ChangeTasState(id);
}
+<<<<<<< Updated upstream
+=======
+
+
+ /// <summary>
+ /// 妫�淇搷浣滆褰�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost, Route("MaintenanceOperationRecord"), AllowAnonymous]
+ public WebResponseContent MaintenanceOperationRecord([FromBody] PaginationDTO pagination)
+ {
+ return Service.MaintenanceOperationRecord(pagination);
+ }
+>>>>>>> Stashed changes
}
}
--
Gitblit v1.9.3