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

gongchunyi

2026-04-03 75ab3e422024b04730c2ce3b5014890d3e731fa8

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