Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_浪潮_pro

liyong

2026-05-09 eb336c03c93de5d0d73514db0ad66f5e02d2a422

 src/main/resources/mapper/account/AccountExpenseMapper.xml

@@ -45,7 +45,7 @@
            AND expense_method = #{accountExpense.expenseMethod}
        </if>
    </select>
    <select id="report" resultType="com.ruoyi.account.dto.AccountDto2">
    <select id="report" resultType="com.ruoyi.account.bean.dto.AccountDto2">
        SELECT
        sdd.dict_label typeName,
        sum(expense_money) account