From 2079ba28f20bde46f7736699c97abf0e1564770d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 14 十月 2024 09:30:46 +0800
Subject: [PATCH] 最新版本

---
 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
index dd2046a..ee75464 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
@@ -2,6 +2,8 @@
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserInfo;
+import com.doumee.core.model.LoginUserModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -19,7 +21,7 @@
 @Data
 @ApiModel("闂ㄧ瑙掕壊淇℃伅琛�")
 @TableName("`device_role`")
-public class DeviceRole {
+public class DeviceRole extends LoginUserModel {
 
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "涓婚敭", example = "1")
@@ -32,7 +34,6 @@
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @ExcelColumn(name="鍒涘缓鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date createDate;
 
     @ApiModelProperty(value = "鏇存柊浜虹紪鐮�")
@@ -41,7 +42,6 @@
 
     @ApiModelProperty(value = "鏇存柊鏃堕棿")
     @ExcelColumn(name="鏇存柊鏃堕棿")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date editDate;
 
     @ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -94,7 +94,6 @@
 
     @ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
     @ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
-    @JsonFormat(pattern = "yyyy-MM-dd")
     private Date hkDate;
 
     @ApiModelProperty(value = "浣跨敤浜烘暟")

--
Gitblit v1.9.3