From 5f6614b4f448890f0b6e82376093ee2878f4464d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 29 Jul 2022 15:21:45 +0800
Subject: [PATCH] 合并冲突
---
src/api/farm/farmingrecord.js | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/api/farm/farmingrecord.js b/src/api/farm/farmingrecord.js
index d4d9aba..8c7d355 100644
--- a/src/api/farm/farmingrecord.js
+++ b/src/api/farm/farmingrecord.js
@@ -89,22 +89,22 @@
})
}
-export const getFarmingCount = (deptId) => {
+export const getFarmingCount = (farmId) => {
return request({
url: '/farmingRecord/getFarmingCount',
method: 'get',
params: {
- deptId
+ farmId
}
})
}
-export const getFarmingStatis = (deptId) => {
+export const getFarmingStatis = (farmId) => {
return request({
url: '/farmingRecord/getFarmingStatis',
method: 'get',
params: {
- deptId
+ farmId
}
})
}
@@ -119,10 +119,13 @@
}
})
}
-export const SelectCount = () => {
+export const SelectCount = (farmId) => {
return request({
url: '/farm/SelectCount',
- method: 'get'
+ method: 'get',
+ params: {
+ farmId
+ }
})
}
--
Gitblit v1.9.3