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

liyong

7 天以前 cf17e9b3e34d1f14f5b9ed41e4eeb82c744cb218

 src/main/java/com/ruoyi/account/mapper/AccountIncomeMapper.java

@@ -22,4 +22,5 @@
    List<AccountIncome> accountIncomeExport(@Param("accountIncome") AccountIncome accountIncome);

    List<AccountDto2> report(@Param("dateQueryDto") DateQueryDto dateQueryDto);
    BigDecimal report1(@Param("dateQueryDto") DateQueryDto dateQueryDto, @Param("dictValue") String dictValue);
}