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

liyong

7 天以前 516a98353f103b44b87a36251cffaf5df8a8f7bc

 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);
}