From de21f15d5b96a714b012337cf8c5d6a53548590f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 28 二月 2024 10:23:53 +0800
Subject: [PATCH] 整理

---
 server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java
index 9714634..7dc0ece 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/admin/response/DeviceEventDTO.java
@@ -1,6 +1,7 @@
 package com.doumee.dao.admin.response;
 
 import com.doumee.core.annotation.excel.ExcelColumn;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -45,6 +46,7 @@
     private String srcType;
 
     @ApiModelProperty(value = "浜嬩欢鍙戠敓鏃堕棿锛堣澶囨椂闂�")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String happenTime;
 
     @ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
@@ -106,14 +108,15 @@
     private String personPhone;
 
     @ApiModelProperty(value = "浜哄憳绫诲瀷")
-    private String personType;
+    private Integer personType;
 
     @ApiModelProperty(value = "浜哄憳韬唤璇佸彿")
     private String personIdcardDecode;
 
     @ApiModelProperty(value = "浜哄憳鍚嶇О")
     private String personName;
-
+    @ApiModelProperty(value = "浜哄憳缂栫爜")
+    private String memberId;
     @ApiModelProperty(value = "璇诲崱鍣ㄧ被鍒�0-鏃犳晥1-IC璇诲崱鍣�2-韬唤璇佽鍗″櫒3-浜岀淮鐮佽鍗″櫒4-鎸囩汗澶�")
     private Integer extEventReaderKind;
 

--
Gitblit v1.9.3