From 23532f54561faf5ee727eb90bd80fa2eebd80e6e Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Sat, 6 Sep 2025 11:25:54 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/resource/TResourceLandController.java | 1 + .../web/controller/resource/TResourceOperationController.java | 1 + .../src/main/java/com/ruoyi/resource/domain/TResourceVo.java | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceLandController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceLandController.java index 215e339..d8c252d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceLandController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceLandController.java @@ -131,6 +131,7 @@ public class TResourceLandController extends BaseController TResourceOperation operation = tResourceOperationService.selectTResourceOperationByDkbm(dkbm); + resource.setId(operation.getId()); resource.setJymj(operation.getJymj()); resource.setJyfs(operation.getJyfs()); resource.setJydxmc(operation.getJydxmc()); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java index c791c0f..08980f7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/resource/TResourceOperationController.java @@ -131,6 +131,7 @@ public class TResourceOperationController extends BaseController TResourceOperation operation = tResourceOperationService.selectTResourceOperationByDkbm(dkbm); + resource.setId(operation.getId()); resource.setJymj(operation.getJymj()); resource.setJyfs(operation.getJyfs()); resource.setJydxmc(operation.getJydxmc()); diff --git a/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceVo.java b/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceVo.java index 4154e1e..3151184 100644 --- a/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceVo.java +++ b/ruoyi-business/src/main/java/com/ruoyi/resource/domain/TResourceVo.java @@ -16,6 +16,8 @@ public class TResourceVo { private static final long serialVersionUID = 1L; + /** fid */ + private Long fid; /** 区域位置名称 */ @Excel(name = "区域位置名称") @@ -96,6 +98,8 @@ public class TResourceVo { // ------------------------------ + /** id */ + private Long id; /** 经营面积(亩) */ @Excel(name = "经营面积(亩)")