From faecccbe46a1f85b5d9b18fce12e02764faba78e Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 09 六月 2021 12:58:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index a06bdc5..526274e 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -73,8 +73,8 @@
param.remove("supplier");
}
/* 鐢熶骇鍗曞彿涓虹┖锛屽垹闄ょ敓浜у崟鍙穡arehouse */
- if (Cools.isEmpty(param.get("warehouse"))) {
- param.remove("warehouse");
+ if (Cools.isEmpty(param.get("mnemonic"))) {
+ param.remove("mnemonic");
}
return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
}
--
Gitblit v1.9.1