diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/home/vo/HomeInfo.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/home/vo/HomeInfo.java index 7f350e1d..b575411e 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/home/vo/HomeInfo.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/home/vo/HomeInfo.java @@ -131,7 +131,7 @@ public class HomeInfo { @Schema(description = "地块或作物集合") private PlotOrCropInfo plotOrCropInfo; @Schema(description = "基地弹框信息") - private List plotPopupFrames; + private PlotPopupFrame plotPopupFrames; @Schema(description = "户主流转信息") private List lesseeList; } diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java index 9a5f4cc1..9cd23fdb 100644 --- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java +++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/home/HomeServiceImpl.java @@ -180,7 +180,7 @@ public class HomeServiceImpl implements HomeService { t.setPoint(e.getPoint()); t.setPlotColor(e.getPlotColor()); t.setPlotOrCropInfo(plotOrCropInfo); - t.setPlotPopupFrames(plotPopupFrame); + t.setPlotPopupFrames(plotPopupFrame.get(0)); t.setLesseeList(lesseeList); return t; } @@ -207,7 +207,7 @@ public class HomeServiceImpl implements HomeService { t.setPoint(e.getPoint()); t.setPlotColor(e.getPlotColor()); // t.setPlotOrCropInfo(plotOrCropInfo); - t.setPlotPopupFrames(plotPopupFrame); + t.setPlotPopupFrames(plotPopupFrame.get(0)); // t.setLesseeList(lesseeList); targetList.add(t); }