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

gongchunyi

4 天以前 2d1e904f3049218474318cb1e2fe5c3a3869cfb0

 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}