From 1c84565d624ad0cce0576a22d0323cf3181d49cd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 26 十月 2023 13:56:28 +0800
Subject: [PATCH] Merge branch 'dev'
---
server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java b/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
index a0f82b5..846ba2d 100644
--- a/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
+++ b/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
@@ -1,5 +1,6 @@
package doumeemes.dao.system.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import doumeemes.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -23,22 +24,49 @@
@TableId(type = IdType.AUTO)
@ApiModelProperty(value = "涓婚敭", example = "1")
private Integer id;
-
@ApiModelProperty(value = "鐧诲綍鐢ㄦ埛ID", example = "1")
private Integer userId;
@ApiModelProperty(value = "浼佷笟缂栫爜", example = "1")
private Integer companyId;
@ApiModelProperty(value = "鏉ユ簮 0pc 1閽夐拤 2缇氱緤骞冲彴 3EDGP骞冲彴", example = "1")
+
+ @ExcelColumn(name="鏉ユ簮", valueMapping = "0=PC骞冲彴;1=閽夐拤骞冲彴;2=缇氱緤骞冲彴;3=EDGP骞冲彴;4=寰俊灏忕▼搴�",width = 6,align = HorizontalAlignment.CENTER)
private Integer orgin;
@ApiModelProperty(value = "浼佷笟鐢ㄦ埛缂栫爜", example = "1")
+ @ExcelColumn(name="浼佷笟鐢ㄦ埛ID", width = 6)
private Integer companyUserId;
+
+ @ApiModelProperty(value = "浼佷笟鍚嶇О")
+ @ExcelColumn(name="浼佷笟鍚嶇О", width = 16)
+ @TableField(exist = false)
+ private String companyName;
+ @ApiModelProperty(value = "浼佷笟缁熶竴淇＄敤浠ｇ爜")
+ @TableField(exist = false)
+ private String companyCode;
+
+ @ApiModelProperty(value = "缇氱緤userID")
+ @TableField(exist = false)
+ private String lingyangUserid;
+ @ApiModelProperty(value = "鐧婚檰娆℃暟")
+ @TableField(exist = false)
+ private int num;
+ @ApiModelProperty(value = "鎿嶄綔娆℃暟")
+ @TableField(exist = false)
+ private int logNum;
+ @ApiModelProperty(value = "浼佷笟鐢ㄦ埛鍚嶇О")
+ @ExcelColumn(name="浼佷笟鐢ㄦ埛鍚嶇О", width = 16)
+ @TableField(exist = false)
+ private String companyUserName;
+
+ @TableField(exist = false)
+ private Integer rootDepartId;
@ApiModelProperty(value = "鐧诲綍鐢ㄦ埛鍚�")
@ExcelColumn(name="鐧诲綍鐢ㄦ埛鍚�")
private String loginUsername;
@ApiModelProperty(value = "鐧诲綍IP")
- @ExcelColumn(name="鐧诲綍IP", color = IndexedColors.RED, width = 8)
+ @ExcelColumn(name="鐧诲綍IP", width = 8)
private String ip;
@ApiModelProperty(value = "鐧诲綍鍦板潃")
@@ -66,15 +94,30 @@
private String serverIp;
@ApiModelProperty(value = "鏄惁鐧诲綍鎴愬姛")
- @ExcelColumn(name="鏄惁鐧诲綍鎴愬姛", valueMapping = "true=鏄�;false=鍚�", align = HorizontalAlignment.CENTER)
+ @ExcelColumn(name="鏄惁鎴愬姛", valueMapping = "true=鎴愬姛;false=澶辫触", align = HorizontalAlignment.CENTER)
private Boolean success;
@ApiModelProperty(value = "澶辫触鍘熷洜")
- @ExcelColumn(name="澶辫触鍘熷洜", color = IndexedColors.RED, width = 16)
+ @ExcelColumn(name="澶辫触鍘熷洜", width = 16)
private String reason;
@ApiModelProperty(value = "鐧诲綍鏃堕棿")
@ExcelColumn(name="鐧诲綍鏃堕棿", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 10)
private Date loginTime;
+<<<<<<< HEAD
+<<<<<<< HEAD
+=======
+ @ApiModelProperty(value = "浼佷笟鍚嶇О")
+ @ExcelColumn(name="浼佷笟鍚嶇О", color = IndexedColors.RED, width = 16)
+ @TableField(exist = false)
+ private String companyName;
+ @ApiModelProperty(value = "浼佷笟鐢ㄦ埛鍚嶇О")
+ @ExcelColumn(name="浼佷笟鐢ㄦ埛鍚嶇О", color = IndexedColors.RED, width = 16)
+ @TableField(exist = false)
+ private String companyUserName;
+
+>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
+=======
+>>>>>>> 1.0.3
}
--
Gitblit v1.9.3