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

gongchunyi

6 天以前 0adbf58fd15052d8a044cf66eaa8afaa8591ba74

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

@@ -58,7 +58,7 @@

    <select id="report1" resultType="java.math.BigDecimal">
        SELECT
        sum(expense_money) account
        ifnull(sum(expense_money),0) account
        FROM account_expense ai
        where
        expense_type=#{dictValue}