From 1abdc3dc706f93804b5e1a65845d6534f860a452 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期五, 10 五月 2024 16:18:49 +0800 Subject: [PATCH] 最新版本 --- server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Devices.java | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Devices.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Devices.java index 0d3630b..31bdf95 100644 --- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Devices.java +++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Devices.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.doumee.core.annotation.excel.ExcelColumn; import com.doumee.core.constants.OperaType; +import com.doumee.core.model.LoginUserModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import com.baomidou.mybatisplus.annotation.IdType; @@ -22,7 +23,7 @@ @Data @ApiModel("璁惧绠$悊淇℃伅琛�") @TableName("`devices`") -public class Devices { +public class Devices extends LoginUserModel { @TableId(type = IdType.AUTO) @ApiModelProperty(value = "涓婚敭", example = "1") @@ -35,7 +36,6 @@ @ApiModelProperty(value = "鍒涘缓鏃堕棿") @ExcelColumn(name="鍒涘缓鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") private Date createDate; @ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1") @@ -44,8 +44,7 @@ @ApiModelProperty(value = "鏇存柊鏃堕棿") @ExcelColumn(name="鏇存柊鏃堕棿") - @JsonFormat(pattern = "yyyy-MM-dd") - private Date editDate; + private Date editDate; @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1") @ExcelColumn(name="鏄惁鍒犻櫎0鍚� 1鏄�") -- Gitblit v1.9.3