From 0b8838c8dd02161c5e7577162d8cd3318d133b68 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 16 十二月 2025 17:02:13 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PageRegionInfoResponse.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PageRegionInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PageRegionInfoResponse.java
index af9fe47..981013a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PageRegionInfoResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/PageRegionInfoResponse.java
@@ -1,7 +1,6 @@
package com.doumee.core.haikang.model.param.respose;
import com.doumee.dao.web.response.platformReport.CarmeraListVO;
-import com.doumee.dao.web.response.platformReport.RegionTreeVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -12,19 +11,18 @@
@ApiModelProperty(value = "鍖哄煙鍞竴鏍囪瘑鐮�")
private String indexCode;// Body String false 鍖哄煙鍞竴鏍囪瘑鐮�
-
@ApiModelProperty(value = "鍖哄煙鍚嶇О")
private String name ;// Body String false 鍖哄煙鍚嶇О
-
@ApiModelProperty(value = "鐖跺尯鍩熷敮涓�鏍囪瘑鐮�")
private String parentIndexCode ;// Body String false 鐖跺尯鍩熷敮涓�鏍囪瘑鐮�
-
@ApiModelProperty(value = "鏍戠紪鍙�")
private String treeCode ;// Body String false 鏍戠紪鍙�
-
-
@ApiModelProperty(value = "涓嬬骇闆嗗悎")
private List<PageRegionInfoResponse> childList;
@ApiModelProperty(value = "鐩戞帶鐐归泦鍚�")
private List<CarmeraListVO> carmeraList;
+ @ApiModelProperty(value = "娑堥槻浼犳劅鍣ㄩ泦鍚�")
+ private List<CarmeraListVO> deviceList;
+ @ApiModelProperty(value = "娑堥槻璁惧闆嗗悎")
+ private List<CarmeraListVO> sensorList;
}
--
Gitblit v1.9.3