From 5827b913fa8013926fc208faa5dbb34c899fdf26 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:23:22 +0800
Subject: [PATCH] 小程序
---
server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java | 13 +++++++++++++
1 files changed, 13 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..1ebb2e2 100644
--- a/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
+++ b/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
@@ -89,4 +89,17 @@
@ApiModelProperty(value = "鐧诲綍鏃堕棿")
@ExcelColumn(name="鐧诲綍鏃堕棿", dateFormat = "yyyy-MM-dd HH:mm:ss", width = 10)
private Date loginTime;
+<<<<<<< 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
}
--
Gitblit v1.9.3