查询围栏进出记录

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceFenceAccessRecordVo.java

@@ -1,6 +1,7 @@
 package com.fuyuanshen.equipment.domain.vo;
 
 import java.util.Date;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
@@ -15,7 +16,6 @@ import java.io.Serializable;
 import java.util.Date;
 
 
-
 /**
  * 围栏进出记录视图对象 device_fence_access_record
  *
@@ -42,11 +42,23 @@ public class DeviceFenceAccessRecordVo implements Serializable {
     @ExcelProperty(value = "围栏ID")
     private Long fenceId;
 
+    /**
+     * 围栏名称
+     */
+    @ExcelProperty(value = "围栏名称")
+    private String fenceName;
+
     /**
      * 设备标识
      */
     @ExcelProperty(value = "设备标识")
-    private String deviceId;
+    private Long deviceId;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty(value = "设备名称")
+    private String deviceName;
 
     /**
      * 用户ID