Merge branch 'develop'

src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/TransactionAnalysisMapper.xml

@@ -592,8 +592,8 @@
          SELECT max(t.transaction_time) mx,t.exchange_rate,date(t.transaction_time) `date`
                            FROM
                                pmt_transactions t
-                           WHERE date(t.transaction_time) >= #{begin} and date(t.transaction_time) <= #{end} AND
+                           WHERE date(t.transaction_time) >= #{begin} And date(t.transaction_time) <= #{end} AND
-                                and t.transaction_type ='Credit' AND t.channel =#{channel}
+                                t.transaction_type ='Credit' AND t.channel =#{channel}
                            GROUP BY
                                date(t.transaction_time)
 						  order by `date` asc