From 9f2c35bcddcd835efc25ed53d3a9c8816781bb5f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 27 二月 2024 14:36:42 +0800
Subject: [PATCH] ERP接口

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java |   24 ++++++++++++++++++++++--
 1 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
index 0a97010..7bfc9df 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java
@@ -58,7 +58,7 @@
 
     @ApiModelProperty(value = "浜嬩欢绫诲瀷")
     @ExcelColumn(name="浜嬩欢绫诲瀷")
-    private String eventType;
+    private Integer eventType;
 
     @ApiModelProperty(value = "浜嬩欢婧愮被鍨嬶紝濡傗�渁csDevice鈥�")
     @ExcelColumn(name="浜嬩欢婧愮被鍨嬶紝濡傗�渁csDevice鈥�")
@@ -71,6 +71,9 @@
     @ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
     @ExcelColumn(name="闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
     private String srcIndex;
+    @ApiModelProperty(value = "鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
+    @ExcelColumn(name="鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
+    private String srcParentIndex;
 
     @ApiModelProperty(value = "闂ㄧ鍚嶇О")
     @ExcelColumn(name="闂ㄧ鍚嶇О")
@@ -188,7 +191,7 @@
     @ApiModelProperty(value = "鐧藉悕鍗曞崟鍙�")
     @ExcelColumn(name="鐧藉悕鍗曞崟鍙�")
     @TableField("ext_event_white_list_no")
-    private String extEventWhiteListNo;
+    private Integer  extEventWhiteListNo;
 
     @ApiModelProperty(value = "浜嬩欢涓婃姤椹卞姩鐨勬椂闂�")
     @ExcelColumn(name="浜嬩欢涓婃姤椹卞姩鐨勬椂闂�")
@@ -258,4 +261,21 @@
     @ExcelColumn(name="閫氶亾鎬婚�氳浜烘暟")
     private Integer totalTimes;
 
+
+    // 鏉′欢鏌ヨ鍙傛暟
+    @ApiModelProperty(value = "鍏抽敭瀛�,濮撳悕/鎵嬫満鍙�")
+    @TableField(exist = false)
+    private String keyWords;
+
+    @ApiModelProperty(value = "浜哄憳绫诲瀷")
+    @TableField(exist = false)
+    private String  personType;
+
+    @ApiModelProperty(value = "寮�濮嬫椂闂�")
+    @TableField(exist = false)
+    private Date startTime;
+
+    @ApiModelProperty(value = "缁撴潫鏃堕棿")
+    @TableField(exist = false)
+    private Date endTime;
 }

--
Gitblit v1.9.3