From 88ac2574d89aed7c28b9c0370b19b8bb2d0364eb Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 07 一月 2025 19:02:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginLogController.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginLogController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginLogController.java
index 7982c50..de6a003 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginLogController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLoginLogController.java
@@ -4,6 +4,8 @@
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.BasePage;
 import com.ruoyi.common.core.web.page.PageInfo;
+import com.ruoyi.common.security.annotation.Logical;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.system.api.domain.SysLoginLog;
 import com.ruoyi.system.service.ISysLoginLogService;
 import com.ruoyi.system.service.ISysUserService;
@@ -27,7 +29,7 @@
 	
 	
 	
-	
+	@RequiresPermissions(value = {"/entryLog"}, logical = Logical.OR)
 	@GetMapping("/pageList")
 	@ApiOperation(value = "获取登录日志列表", tags = {"管理后台-登录日志"})
 	public AjaxResult<PageInfo<SysLoginLog>> pageList(String name, BasePage basePage){
@@ -36,6 +38,7 @@
 	}
 	
 	
+	@RequiresPermissions(value = {"/entryLog/add"}, logical = Logical.OR)
 	@PostMapping("/addLoginLog")
 	@ApiOperation(value = "添加登录日志", tags = {"管理后台-登录日志"})
 	public AjaxResult addLoginLog(@RequestBody SysLoginLog loginLog){

--
Gitblit v1.7.1