Merge remote-tracking branch 'origin/jtwy' into jtwy

liyong

22 小时以前 6b39b27a2807f4fb60e3b8ac12a1bb5deaad7775

 src/main/java/com/ruoyi/account/service/AccountExpenseService.java

@@ -7,6 +7,7 @@
import com.ruoyi.account.dto.AccountDto2;
import com.ruoyi.account.dto.AccountDto3;
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.account.pojo.AccountIncome;
import com.ruoyi.dto.DateQueryDto;

import javax.servlet.http.HttpServletResponse;
@@ -24,4 +25,8 @@
    List<AccountDto3> reportExpense();

    Map<String,List<String>> analysis();

    AccountExpense getByInvoiceNumber(String purchaseContractNumber);

    List<AccountExpense> getByInvoiceNumberList(String purchaseContractNumber);
}