Merge remote-tracking branch 'origin/master'

sinake

2 天以前 49120f2b9db33455756a911e56cfefd7c3120a14

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

@@ -71,6 +71,10 @@
        if (serviceReimbursementpayee.getUploadtime() != null) {
            wrappers.eq(ServiceReimbursementpayee::getUploadtime, serviceReimbursementpayee.getUploadtime());
        }

        if (StringUtils.isNotBlank(serviceReimbursementpayee.getRemark())) {
            wrappers.eq(ServiceReimbursementpayee::getRemark, serviceReimbursementpayee.getRemark());
        }
        return this.list(wrappers);
    }