From 69676cf96655ea6235a5e228c18783916d4edb55 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 10:02:18 +0800
Subject: [PATCH] 海康接口对接开发

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

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
index 5eff5cf..0c48b92 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
@@ -55,13 +55,13 @@
     @ExcelColumn(name="鍚嶇О")
     private String name;
 
-    @ApiModelProperty(value = "鏄惁榛樿 0鍚� 1鏄�", example = "1")
-    @ExcelColumn(name="鏄惁榛樿 0鍚� 1鏄�")
+    @ApiModelProperty(value = "鏄惁鏄粯璁ゆ潈闄愮粍0: 鏄�1: 鍚�", example = "1")
+    @ExcelColumn(name="鏄惁鏄粯璁ゆ潈闄愮粍0: 鏄�1: 鍚�")
     private Integer isDefault;
 
     @ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
     @ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
-    private String type;
+    private Integer type;
 
     @ApiModelProperty(value = "鍙娇鐢ㄩ棬绂佺紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
     @ExcelColumn(name="鍙娇鐢ㄩ棬绂佺紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
@@ -83,4 +83,18 @@
     @ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
     private Integer status;
 
+    @ApiModelProperty(value = "娴峰悍鏍囪瘑", example = "1")
+    @ExcelColumn(name="娴峰悍鏍囪瘑")
+    private String hkId;
+
+    @ApiModelProperty(value = "娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�", example = "1")
+    @ExcelColumn(name="娴峰悍鍚屾鐘舵�� 0鏈悓姝� 1宸插悓姝�")
+    private Integer hkStatus;
+
+    @ApiModelProperty(value = "娴峰悍鏈�杩戝悓姝ユ椂闂�")
+    @ExcelColumn(name="娴峰悍鏈�杩戝悓姝ユ椂闂�")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date hkDate;
+
+
 }

--
Gitblit v1.9.3