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/LoginhsyController.cs |   26 ++++++++++++++++++++++++++
 1 files changed, 26 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/LoginhsyController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/LoginhsyController.cs"
index ae32725..70dd57a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/LoginhsyController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/LoginhsyController.cs"
@@ -1,6 +1,7 @@
 锘縰sing Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using WIDESEAWCS_Core.BaseController;
+using WIDESEAWCS_DTO.Telescopic;
 using WIDESEAWCS_ITelescopicService;
 using WIDESEAWCS_IWMSPart;
 using WIDESEAWCS_Model.Models;
@@ -14,5 +15,30 @@
         public LoginhsyController(ILoginhsyService service) : base(service)
         {
         }
+<<<<<<< Updated upstream
+=======
+
+
+        /// <summary>
+        /// 鐧诲叆璁板綍
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost, Route("LoginRecord"),AllowAnonymous]
+        public WebResponseContent LoginRecord([FromBody]PaginationDTO pagination)
+        {
+            return Service.LoginRecord(pagination);
+        }
+
+        /// <summary>
+        /// 缁欐帹鍑烘椂闂�
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpPost, Route("OutLoginTime"), AllowAnonymous]
+        public WebResponseContent OutLoginTime(int id)
+        {
+            return Service.OutLoginTime(id);
+        }
+>>>>>>> Stashed changes
     }
 }

--
Gitblit v1.9.3