Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/domain/vo/ZEngineeringPipeJackingVo.java

@@ -85,5 +85,6 @@ public class ZEngineeringPipeJackingVo extends BaseEntity implements Serializabl
     private List<ZEngineeringNodeBo> zEngineeringNodeBoList;
     @JsonProperty("pics")
     private List<ZEngiineeringPhotoVo> pics;
-
+    @JsonProperty("zEngineeringNodeBo")
+    private ZEngineeringNodeBo zEngineeringNodeBo;
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZEngineeringPipeJackingServiceImpl.java

@@ -83,7 +83,7 @@ public class ZEngineeringPipeJackingServiceImpl implements IZEngineeringPipeJack
         bo.setCreateTime(jackingVo.getCreateTime());
         bo.setCivliId(jackingVo.getId());
         bo.setType(type);
-        jackingVo.setZEngineeringNodeBoList(nodeService.queryListDetails(bo));
+        jackingVo.setZEngineeringNodeBo(nodeService.query(bo));
         return jackingVo;
     }