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

liyong

7 天以前 cf77dd834b5c4f6b75aea748ba3f1d812de8414c

 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}