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

zss

昨天 bb6d3de7c1758fc0e4d3e8e2f364c28b501e65b4

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

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

    AccountDto report(DateQueryDto dateQueryDto);

    List<AccountDto3> reportExpense();
    List<AccountDto3> reportExpense(ReportDateDto reportDateDto);

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