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

云

2026-05-25 1b77c2724e38d087f3eab4a2f27b3b165f4265dc

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