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

maven

3 天以前 e099d0cd93c26b44bc1c10e51944edfad0465b0c

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

@@ -76,7 +76,7 @@
               IFNULL(SUM(income_money), 0)            AS amount
        FROM account_income
        WHERE income_date BETWEEN #{startDate} AND #{endDate}
          AND business_type = 1
#           AND business_type = 1
        GROUP BY dateStr
        ORDER BY dateStr