From 675af262e4e511c9a240d9c1fa3332d1dc8d0c42 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 13 一月 2026 13:15:37 +0800
Subject: [PATCH] 1.工时管理:辅助工时编辑后录入人姓名变成编辑人问题修复 2.外购下单:标签打印功能调整 3.人员:培训计划导入导出添加【培训大类】字段 4.业务管理:报检新增【物料属性】字段选择,其余页面添加【物料属性】查询条件以及数据回显

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
index 4935a56..7e4fb7f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java
@@ -12,7 +12,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -57,7 +57,7 @@
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
     @Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.DELETE)
     @DeleteMapping("/{infoIds}")
-    public Result remove(@PathVariable Long[] infoIds)
+    public AjaxResult remove(@PathVariable Long[] infoIds)
     {
         return toAjax(logininforService.deleteLogininforByIds(infoIds));
     }
@@ -65,7 +65,7 @@
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
     @Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clean")
-    public Result clean()
+    public AjaxResult clean()
     {
         logininforService.cleanLogininfor();
         return success();
@@ -74,7 +74,7 @@
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:unlock')")
     @Log(title = "璐︽埛瑙i攣", businessType = BusinessType.OTHER)
     @GetMapping("/unlock/{userName}")
-    public Result unlock(@PathVariable("userName") String userName)
+    public AjaxResult unlock(@PathVariable("userName") String userName)
     {
         passwordService.clearLoginRecordCache(userName);
         return success();

--
Gitblit v1.9.3