From 8d0d6126ea8d17df13d62a8dd6a5a6e2b8d279c3 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期五, 05 十一月 2021 10:57:24 +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