From a79f7d80e55319ae1a40954f6a4ce6e382cc1649 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 28 八月 2023 15:03:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java | 2 +-
1 files changed, 1 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 709a3e6..2b32cbe 100644
--- a/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
+++ b/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
@@ -84,7 +84,7 @@
private String companyName;
@ApiModelProperty(value = "浼佷笟鐢ㄦ埛鍚嶇О")
- @ExcelColumn(name="浼佷笟鍚嶇О", color = IndexedColors.RED, width = 16)
+ @ExcelColumn(name="浼佷笟鐢ㄦ埛鍚嶇О", color = IndexedColors.RED, width = 16)
@TableField(exist = false)
private String companyUserName;
--
Gitblit v1.9.3