chore: 合并失败

gongchunyi

9 天以前 b4c3f13af821d10a0ada7164bda95f23bac206e5

 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