From 98e52a2d1a05276e11d2e5c99ec05e670228fbd6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 18 十二月 2023 18:21:20 +0800
Subject: [PATCH] 海康接口对接开发

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
index 00540e4..984e2f4 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Retention.java
@@ -95,8 +95,13 @@
 
     @ApiModelProperty(value = "鐝")
     @ExcelColumn(name="鐝")
-    private String classes;
-
+    private Integer classes;
+    @ApiModelProperty(value = "娴峰悍闂ㄧ鍚嶇О")
+    @ExcelColumn(name="娴峰悍闂ㄧ鍚嶇О")
+    private String deviceName;
+    @ApiModelProperty(value = "娴峰悍闂ㄧ缂栫爜")
+    @ExcelColumn(name="娴峰悍闂ㄧ缂栫爜")
+    private String deviceIndex;
     @ApiModelProperty(value = "鍏ュ巶鏃堕棿")
     @ExcelColumn(name="鍏ュ巶鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -115,13 +120,15 @@
     @TableField(exist = false)
     public String companyName;
 
-    @ApiModelProperty(value = "璁垮鐢ㄦ埛绫诲瀷")
-    @ExcelColumn(name="璁垮鐢ㄦ埛绫诲瀷")
-    @TableField(exist = false)
-    private Integer memberType;
 
-    @ApiModelProperty(value = "闂ㄧ鍚嶇О")
-    @ExcelColumn(name="闂ㄧ鍚嶇О")
-    @TableField(exist = false)
-    private String srcName;
+    // 鏉′欢鏌ヨ鍙傛暟
+    @ApiModelProperty(value = "濮撳悕/鎵嬫満鍙�")
+    private String keyWords;
+
+    @ApiModelProperty(value = "寮�濮嬫椂闂�")
+    private Date startTime;
+
+    @ApiModelProperty(value = "缁撴潫鏃堕棿")
+    private Date endTime;
+
 }

--
Gitblit v1.9.3