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 | 31 +++++++++++++++++++++++++++++++
1 files changed, 31 insertions(+), 0 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 a21e31d..846ba2d 100644
--- a/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
+++ b/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
@@ -40,11 +40,26 @@
@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="鐧诲綍鐢ㄦ埛鍚�")
@@ -89,4 +104,20 @@
@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