From 4597a2c455560dbf3fa3c0d994a896c6e58bbb5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= Date: Fri, 7 Nov 2025 20:38:43 +0800 Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 首页加载内容拆分 - 新增获取地块信息接口 --- .../yudao/module/farm/controller/admin/home/vo/HomeInfo.java | 2 +- .../yudao/module/farm/service/home/HomeServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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); }