From f8b1073fbb28d37e08016eed32c682f8c5eae391 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 02 二月 2024 17:26:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/service/src/main/java/com/doumee/dao/business/model/DuLog.java | 7 +++++--
1 files changed, 5 insertions(+), 2 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 b06dbdf..9069da9 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
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -87,6 +87,9 @@
@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)
--
Gitblit v1.9.3