From 2af6fc082247372eb11fb54320345c0fcfa26518 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 20 Jul 2022 12:00:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java b/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java
index c2e6300..aaf214f 100644
--- a/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java
+++ b/src/main/java/org/springblade/modules/sale/service/impl/SaleServiceImpl.java
@@ -42,13 +42,13 @@
 	}
 
 	@Override
-	public Map<String, String> selctSaletCount() {
-		return baseMapper.selctSaletCount();
+	public Map<String, String> selctSaletCount(String farmId) {
+		return baseMapper.selctSaletCount(farmId);
 	}
 
 	@Override
-	public List<Map<Object, String>> selctSaletZ() {
-		return baseMapper.selctSaletZ();
+	public List<Map<Object, String>> selctSaletZ(SaleVO sale) {
+		return baseMapper.selctSaletZ(sale);
 	}
 
 	/**
@@ -61,8 +61,8 @@
 		return baseMapper.selectMarketCirculate(sale);
 	}
 	@Override
-	public List<Map<Object, String>> selectMarketDistrict() {
-		return baseMapper.selectMarketDistrict();
+	public List<Map<Object, String>> selectMarketDistrict(String farmId) {
+		return baseMapper.selectMarketDistrict(farmId);
 	}
 
 }

--
Gitblit v1.9.3