From 6815206f357f19ba27593e5bfae01f5eccf9b2d8 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 24 八月 2023 18:43:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java | 3 +--
1 files changed, 1 insertions(+), 2 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 b16fc6c..804ee3a 100644
--- a/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
+++ b/server/src/main/java/doumeemes/dao/system/model/SystemLoginLog.java
@@ -24,14 +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=寰俊灏忕▼搴�", align = HorizontalAlignment.CENTER)
+ @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;
--
Gitblit v1.9.3