From 0e0dfda02355cc17305b5a3d2680e82095dd411e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 14 五月 2025 11:36:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/dao/business/model/DuLog.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/DuLog.java b/server/service/src/main/java/com/doumee/dao/business/model/DuLog.java
index 76d91c1..113d2fb 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/DuLog.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/DuLog.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -13,7 +14,7 @@
/**
* 娲鹃仯鍗曚綅鎿嶄綔鍘嗗彶琛�
* @author 姹熻箘韫�
- * @date 2024/01/15 15:07
+ * @date 2024/01/16 10:03
*/
@Data
@ApiModel("娲鹃仯鍗曚綅鎿嶄綔鍘嗗彶琛�")
@@ -31,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -63,8 +64,8 @@
@ExcelColumn(name="绠�浠�")
private String content;
- @ApiModelProperty(value = "绫诲瀷 0鎻愪氦鐢宠 1瀹℃壒鍗曚綅閫氳繃 2瀹℃壒鍗曚綅涓嶉�氳繃 3淇敼鍗曚綅淇℃伅 4娣诲姞宸ョ 5瀹℃壒宸ョ閫氳繃 6瀹℃壒宸ョ涓嶉�氳繃", example = "1")
- @ExcelColumn(name="绫诲瀷 0鎻愪氦鐢宠 1瀹℃壒鍗曚綅閫氳繃 2瀹℃壒鍗曚綅涓嶉�氳繃 3淇敼鍗曚綅淇℃伅 4娣诲姞宸ョ 5瀹℃壒宸ョ閫氳繃 6瀹℃壒宸ョ涓嶉�氳繃")
+ @ApiModelProperty(value = "绫诲瀷 0鎻愪氦鐢宠 1瀹℃牳鍗曚綅閫氳繃 2瀹℃牳鍗曚綅涓嶉�氳繃 3淇敼鍗曚綅淇℃伅 4娣诲姞宸ョ 5瀹℃牳宸ョ閫氳繃 6瀹℃牳宸ョ涓嶉�氳繃", example = "1")
+ @ExcelColumn(name="绫诲瀷 0鎻愪氦鐢宠 1瀹℃牳鍗曚綅閫氳繃 2瀹℃牳鍗曚綅涓嶉�氳繃 3淇敼鍗曚綅淇℃伅 4娣诲姞宸ョ 5瀹℃牳宸ョ閫氳繃 6瀹℃牳宸ョ涓嶉�氳繃")
private Integer objType;
@ApiModelProperty(value = "鍏宠仈瀵硅薄缂栫爜")
@@ -83,4 +84,16 @@
@ExcelColumn(name="鐘舵��0姝ｅ父 1鍋滅敤")
private Integer status;
+ @ApiModelProperty(value = "鍒涘缓浜哄悕绉�", example = "1")
+ @TableField(exist = false)
+ private String creatorName;
+ @ApiModelProperty(value = "鍒涘缓浜虹被鍨� 0骞冲彴 1浼佷笟", example = "1")
+ @TableField(exist = false)
+ private Integer creatorType;
+
+ @ApiModelProperty(value = "鍏徃鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String companyName;
+
+
}
--
Gitblit v1.9.3