From 92f94b0a4e65b0ab5c4195e632b5e4d1b0158aac Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 28 二月 2024 12:03:26 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 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 18331da..39632b7 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
@@ -71,6 +71,9 @@
     @ApiModelProperty(value = "闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
     @ExcelColumn(name="闂ㄧ鐐瑰敮涓�鎺ュ叆缂栫爜")
     private String srcIndex;
+    @ApiModelProperty(value = "鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
+    @ExcelColumn(name="鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
+    private String srcParentIndex;
 
     @ApiModelProperty(value = "闂ㄧ鍚嶇О")
     @ExcelColumn(name="闂ㄧ鍚嶇О")
@@ -263,6 +266,9 @@
     @ApiModelProperty(value = "鍏抽敭瀛�,濮撳悕/鎵嬫満鍙�")
     @TableField(exist = false)
     private String keyWords;
+    @ApiModelProperty(value = "鍏徃/缁勭粐鍚嶇О")
+    @TableField(exist = false)
+    private String companyName;
 
     @ApiModelProperty(value = "浜哄憳绫诲瀷")
     @TableField(exist = false)

--
Gitblit v1.9.3