From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/dao/business/model/CompanyLog.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/server/src/main/java/doumeemes/dao/business/model/CompanyLog.java b/server/src/main/java/doumeemes/dao/business/model/CompanyLog.java
index 756134a..954a517 100644
--- a/server/src/main/java/doumeemes/dao/business/model/CompanyLog.java
+++ b/server/src/main/java/doumeemes/dao/business/model/CompanyLog.java
@@ -34,6 +34,11 @@
@ExcelColumn(name="鍒涘缓浜虹紪鐮�")
private Integer createUser;
+ @ApiModelProperty(value = "鍒涘缓浜虹紪鐮�", example = "1")
+ @ExcelColumn(name="鍒涘缓浜虹紪鐮�")
+ @TableField(exist = false)
+ private String createUserName;
+
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
private Date createTime;
@@ -77,4 +82,8 @@
@ApiModelProperty(value = "瀹㈡埛绠�绉�" )
@TableField(exist = false)
private String shortName;
+
+ @ApiModelProperty(value = "瀹㈡埛绠�绉�" )
+ @TableField(exist = false)
+ private String userName;
}
--
Gitblit v1.9.3