From 25b114aae7e9efb2bc54cca8a5875237bc3da694 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 18 五月 2020 14:27:15 +0800
Subject: [PATCH] 支持是否需要设置token属性，自定义返回码消息。
---
ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
index ea0c40f..cea9373 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/monitor/domain/SysLogininfor.java
@@ -1,6 +1,9 @@
package com.ruoyi.project.monitor.domain;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel.ColumnType;
import com.ruoyi.framework.web.domain.BaseEntity;
/**
@@ -13,30 +16,40 @@
private static final long serialVersionUID = 1L;
/** ID */
+ @Excel(name = "搴忓彿", cellType = ColumnType.NUMERIC)
private Long infoId;
/** 鐢ㄦ埛璐﹀彿 */
+ @Excel(name = "鐢ㄦ埛璐﹀彿")
private String userName;
/** 鐧诲綍鐘舵�� 0鎴愬姛 1澶辫触 */
+ @Excel(name = "鐧诲綍鐘舵��", readConverterExp = "0=鎴愬姛,1=澶辫触")
private String status;
/** 鐧诲綍IP鍦板潃 */
+ @Excel(name = "鐧诲綍鍦板潃")
private String ipaddr;
/** 鐧诲綍鍦扮偣 */
+ @Excel(name = "鐧诲綍鍦扮偣")
private String loginLocation;
/** 娴忚鍣ㄧ被鍨� */
+ @Excel(name = "娴忚鍣�")
private String browser;
/** 鎿嶄綔绯荤粺 */
+ @Excel(name = "鎿嶄綔绯荤粺")
private String os;
/** 鎻愮ず娑堟伅 */
+ @Excel(name = "鎻愮ず娑堟伅")
private String msg;
/** 璁块棶鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁块棶鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date loginTime;
public Long getInfoId()
--
Gitblit v1.9.3