From e4db9c4fc4e40d7b41ee0014aaa9feb8ba9e9bf0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 02 三月 2021 17:02:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/zy/asrs/controller/WaitPakinController.java | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index f81876e..8c9d5b5 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -45,6 +45,7 @@
else {
wrapper.orderBy("modi_time", false);
}
+ wrapper.isNotNull("zpallet");
return R.ok(waitPakinService.selectPage(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1