Merge remote-tracking branch 'origin/master'

sinake

2 天以前 49120f2b9db33455756a911e56cfefd7c3120a14

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatecompletioninfoServiceImpl.java

@@ -74,6 +74,12 @@
        if (StringUtils.isNotNull(serviceDonatecompletioninfo.getInfoid())) {
            wrappers.eq(ServiceDonatecompletioninfo::getInfoid, serviceDonatecompletioninfo.getInfoid());
        }
        // 2026-10-22：默认只查询未删除记录
        if (StringUtils.isNotNull(serviceDonatecompletioninfo.getDel_flag())) {
            wrappers.eq(ServiceDonatecompletioninfo::getDel_flag, serviceDonatecompletioninfo.getDel_flag());
        } else {
            wrappers.eq(ServiceDonatecompletioninfo::getDel_flag, 0);
        }
        return this.list(wrappers);
    }