From cd34c87afa730c48e2b2be61d700b1fee409e02c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 12 七月 2021 11:00:12 +0800
Subject: [PATCH] fix 修复升级合并错误
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 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 ce04f8a..2bb0b13 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
@@ -1,13 +1,5 @@
package com.ruoyi.web.controller.monitor;
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-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.AjaxResult;
@@ -16,6 +8,11 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysLogininfor;
import com.ruoyi.system.service.ISysLogininforService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* 绯荤粺璁块棶璁板綍
@@ -33,23 +30,21 @@
@GetMapping("/list")
public TableDataInfo list(SysLogininfor logininfor)
{
- startPage();
- List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
- return getDataTable(list);
+ return logininforService.selectPageLogininforList(logininfor);
}
- @Log(title = "鐧婚檰鏃ュ織", businessType = BusinessType.EXPORT)
+ @Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
@GetMapping("/export")
public AjaxResult export(SysLogininfor logininfor)
{
List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
- return util.exportExcel(list, "鐧婚檰鏃ュ織");
+ return util.exportExcel(list, "鐧诲綍鏃ュ織");
}
@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
- @Log(title = "鐧婚檰鏃ュ織", businessType = BusinessType.DELETE)
+ @Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.DELETE)
@DeleteMapping("/{infoIds}")
public AjaxResult remove(@PathVariable Long[] infoIds)
{
@@ -57,7 +52,7 @@
}
@PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
- @Log(title = "鐧婚檰鏃ュ織", businessType = BusinessType.CLEAN)
+ @Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.CLEAN)
@DeleteMapping("/clean")
public AjaxResult clean()
{
--
Gitblit v1.9.3