Merge remote-tracking branch 'origin/dev_New_pro' into dev_鹤壁_善鼎通讯_pro

yuan

2026-05-14 4eb1118aa7e9fe3096fa029f19eba21eb25242d9

 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