From 16772c5dc27772c2eee57d2eab061ad15e8ad87e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 29 二月 2024 11:43:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 341e963..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="闂ㄧ鍚嶇О")
@@ -258,15 +261,14 @@
@ExcelColumn(name="閫氶亾鎬婚�氳浜烘暟")
private Integer totalTimes;
- @ApiModelProperty(value = "鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
- @ExcelColumn(name = "鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜")
- private String srcParentIndex;
-
// 鏉′欢鏌ヨ鍙傛暟
@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