From 83c7cfa4ecd5d59106b09efff26be43141e38386 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期四, 21 十二月 2023 09:10:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceEvent.java | 4 ++++ 1 files changed, 4 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 7bfc9df..319179b 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 @@ -261,6 +261,10 @@ @ExcelColumn(name="閫氶亾鎬婚�氳浜烘暟") private Integer totalTimes; + @ApiModelProperty(value = "鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜") + @ExcelColumn(name = "鎺у埗鍣ㄨ澶囧敮涓�鎺ュ叆缂栫爜") + private String srcParentIndex; + // 鏉′欢鏌ヨ鍙傛暟 @ApiModelProperty(value = "鍏抽敭瀛�,濮撳悕/鎵嬫満鍙�") -- Gitblit v1.9.3