From a69578ed877252e70d45d4753258b3d7b6937606 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:24:34 +0800
Subject: [PATCH] a
---
server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java | 3 +++
1 files changed, 3 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 1ebb2e2..eacb013 100644
--- a/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
+++ b/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
@@ -90,6 +90,7 @@
@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)
@@ -102,4 +103,6 @@
private String companyUserName;
>>>>>>> 89d77a7cd7285feda993bffec2513892f8bd355f
+=======
+>>>>>>> 1.0.3
}
--
Gitblit v1.9.3