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

zss

8 天以前 bd1c98db3e0de80c06a53d3302781c2b0b50a3da

 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