Merge remote-tracking branch 'origin/master'

sinake

4 天以前 ee089a8ac4a9d99ef0a0491bbf1d80a2d4fbc393

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

@@ -68,6 +68,9 @@
        if (StringUtils.isNotBlank(serviceInvoice.getReimburseState())) {
            wrappers.eq(ServiceInvoice::getReimburseState, serviceInvoice.getReimburseState());
        }
        if (StringUtils.isNotBlank(serviceInvoice.getReimburseId())) {
            wrappers.eq(ServiceInvoice::getReimburseId, serviceInvoice.getReimburseId());
        }
        wrappers.orderByDesc(ServiceInvoice::getCreateTime).orderByDesc(ServiceInvoice::getId);
        return this.list(wrappers);
    }