From 8e9a7c81a81ab01a13024396e0297e2c11c38116 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 25 八月 2023 09:12:13 +0800
Subject: [PATCH] 修复bug
---
server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 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..804ee3a 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,12 +24,13 @@
@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")
private Integer companyUserId;
@@ -76,5 +78,9 @@
@ApiModelProperty(value = "鐧诲綍鏃堕棿")
@ExcelColumn(name="鐧诲綍鏃堕棿", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 10)
private Date loginTime;
+ @ApiModelProperty(value = "浼佷笟鍚嶇О")
+ @ExcelColumn(name="浼佷笟鍚嶇О", color = IndexedColors.RED, width = 16)
+ @TableField(exist = false)
+ private String companyName;
}
--
Gitblit v1.9.3