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

liyong

10 天以前 dee56ed8d52f1d8ee1f89b369561c49e9b3b7c2d

 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}