From d81fdeef2ad2f7ecc548cebad6ab15455bf3da27 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 30 Jul 2024 14:53:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev

---
 src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java b/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
index 26ce42f..82a1267 100644
--- a/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
+++ b/src/main/java/com/dji/sample/patches/service/impl/GetPatchesServiceImpl.java
@@ -70,8 +70,8 @@
         if (param.getDkmj()!=null){
             queryWrapper.eq(LotInfo::getDkmj,param.getDkmj());
         }
-        if (param.getIsPlan() != null) {
-            queryWrapper.eq(LotInfo::getIsPlan, param.getIsPlan());
+        if (param.getIsPush() != null) {
+            queryWrapper.eq(LotInfo::getIsPush, param.getIsPush());
         }
 
         // 执行分页查询

--
Gitblit v1.9.3