Browse Source

修正文字错误

RuoYi 4 years ago
parent
commit
28bceda630

+ 4 - 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java

@@ -38,18 +38,18 @@ public class SysLogininforController extends BaseController
         return getDataTable(list);
     }
 
-    @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 +57,7 @@ public class SysLogininforController extends BaseController
     }
 
     @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
-    @Log(title = "登日志", businessType = BusinessType.CLEAN)
+    @Log(title = "登日志", businessType = BusinessType.CLEAN)
     @DeleteMapping("/clean")
     public AjaxResult clean()
     {

+ 4 - 4
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -68,12 +68,12 @@ public class SysUser extends BaseEntity
     /** 删除标志(0代表存在 2代表删除) */
     private String delFlag;
 
-    /** 最后登IP */
-    @Excel(name = "最后登IP", type = Type.EXPORT)
+    /** 最后登IP */
+    @Excel(name = "最后登IP", type = Type.EXPORT)
     private String loginIp;
 
-    /** 最后登时间 */
-    @Excel(name = "最后登时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
+    /** 最后登时间 */
+    @Excel(name = "最后登时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
 
     /** 部门对象 */

+ 1 - 1
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java

@@ -22,7 +22,7 @@ public class LoginUser implements UserDetails
     private String token;
 
     /**
-     * 登时间
+     * 登时间
      */
     private Long loginTime;
 

+ 1 - 1
ruoyi-framework/src/main/java/com/ruoyi/framework/manager/factory/AsyncFactory.java

@@ -25,7 +25,7 @@ public class AsyncFactory
     private static final Logger sys_user_logger = LoggerFactory.getLogger("sys-user");
 
     /**
-     * 记录登信息
+     * 记录登信息
      * 
      * @param username 用户名
      * @param status 状态

+ 2 - 2
sql/ry_20200920.sql

@@ -52,8 +52,8 @@ create table sys_user (
   password          varchar(100)    default ''                 comment '密码',
   status            char(1)         default '0'                comment '帐号状态(0正常 1停用)',
   del_flag          char(1)         default '0'                comment '删除标志(0代表存在 2代表删除)',
-  login_ip          varchar(50)     default ''                 comment '最后登IP',
-  login_date        datetime                                   comment '最后登时间',
+  login_ip          varchar(50)     default ''                 comment '最后登IP',
+  login_date        datetime                                   comment '最后登时间',
   create_by         varchar(64)     default ''                 comment '创建者',
   create_time       datetime                                   comment '创建时间',
   update_by         varchar(64)     default ''                 comment '更新者',