From 208ec6274f74c88ccf86c2fb3432a60cc7d21d59 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 17 十二月 2025 15:02:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index 62cc0a3..cb23047 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -283,7 +283,7 @@
for(PageRegionInfoResponse p : allList){
for(CarmeraListVO c : carmeraListVOList){
if(StringUtils.equals(p.getIndexCode(),c.getReginCode()) ){
- if(p.getCarmeraList()==null){
+ if(p.getDeviceList()==null){
p.setDeviceList(new ArrayList<>());
}
p.getDeviceList().add(c);
--
Gitblit v1.9.3