merge: 合并origin/dev_New_pro从bd86068d之后的所有提交

gongchunyi

2026-05-18 ecfcfe8ac671cd2f46dc8d9b9129e1851957b7c0

 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