From 8d725e7bd1ad30b5ba437cbf420da622cfefc7c6 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 22 十一月 2024 15:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java
index 8aaf0a0..435445d 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/intake/IntakeCtrl.java
@@ -36,7 +36,6 @@
* @param qo
* @return
*/
- //@GetMapping(path = "one_intake")
@GetMapping(path = "all_intakes")
public BaseResponse<QueryResultVo<VoOnLineIntake>> getOneIntake(OnLineIntakesQO qo) {
try {
@@ -64,17 +63,17 @@
/**
* 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛锛堝湪绾垮拰涓嶅湪绾匡級
- * @param operator
+ * @param operatorId
* @return
*/
@GetMapping(path = "used_intakes")
- public BaseResponse<List<VoOnLineIntake>> getUsedIntakes(Long operator) {
- if(operator == null || operator <= 0) {
+ public BaseResponse<List<VoOnLineIntake>> getUsedIntakes(Long operatorId) {
+ if(operatorId == null || operatorId <= 0) {
return BaseResponseUtils.buildErrorMsg("鎿嶄綔鍛樹笉鑳戒负绌�");
}
try {
- List<VoOnLineIntake> res = intakeSv.getUsedIntakes(operator);
+ List<VoOnLineIntake> res = intakeSv.getUsedIntakes(operatorId);
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鏌ヨ鍙栨按鍙ｅ紓甯�", e);
--
Gitblit v1.8.0