Merge remote-tracking branch 'origin/master'

sinake

7 天以前 e5c4a1f16552f115c9c5407b6008ebd9f230c747

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

@@ -33,6 +33,9 @@
        if (serviceDonationwitnessorgan.getInfoid() != null) {
            wrappers.eq(ServiceDonationwitnessorgan::getInfoid, serviceDonationwitnessorgan.getInfoid());
        }
        if (serviceDonationwitnessorgan.getDonationwitnessId() != null) {
            wrappers.eq(ServiceDonationwitnessorgan::getDonationwitnessId, serviceDonationwitnessorgan.getDonationwitnessId());
        }
        if (StringUtils.isNotBlank(serviceDonationwitnessorgan.getDonorno())) {
            wrappers.eq(ServiceDonationwitnessorgan::getDonorno, serviceDonationwitnessorgan.getDonorno());
        }