Merge remote-tracking branch 'origin/ht-dev' into ht-dev

aix

2024-07-30 249d316e0b8c79b71b779b5716bc488e1d08a9b3

 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());
        }

        // 执行分页查询