From 7425196960cc7ecda7d2a09100e0c6456309ff64 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 28 Jul 2022 11:33:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
index c34add1..b1cd6d7 100644
--- a/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
+++ b/src/main/java/org/springblade/modules/farmplant/controller/FarmPlantController.java
@@ -295,7 +295,7 @@
*/
@GetMapping("/pagePalnt")
public R pagePalnt(FarmPlantVO farmPlant, Query query) {
- int i = farmplantService.selectCount();
+ int i = farmplantService.selectCount(farmPlant);
IPage<FarmPlantVO> pages = farmplantService.selectFarmPlantPage(Condition.getPage(query), farmPlant);
Map map = new HashMap<>();
map.put("num", i);
--
Gitblit v1.9.3