From d48d6e9bb0bb48f8338798d8a2cba60396e16698 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 09 Jul 2022 09:52:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/farm/controller/FarmController.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farm/controller/FarmController.java b/src/main/java/org/springblade/modules/farm/controller/FarmController.java
index 0fb2510..9538d35 100644
--- a/src/main/java/org/springblade/modules/farm/controller/FarmController.java
+++ b/src/main/java/org/springblade/modules/farm/controller/FarmController.java
@@ -34,6 +34,7 @@
import javax.validation.Valid;
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -92,6 +93,17 @@
}
/**
+ * 自定义查询所有农场信息（不分页）
+ * @param farm
+ * @return
+ */
+ @GetMapping("/getFarmList")
+ public R<List<FarmVO>> getFarmList(FarmVO farm) {
+ List<FarmVO> farmList = farmService.getFarmList(farm);
+ return R.data(farmList);
+ }
+
+ /**
* 新增
*/
@PostMapping("/save")
--
Gitblit v1.9.3