Merge branch 'hotfix' into develop

src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java

@@ -689,7 +689,8 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
                 row = sheet.createRow(++rowNum);
                 row.createCell(0, Cell.CELL_TYPE_STRING).setCellValue(settle.getString("order_id"));
                 row.createCell(1, Cell.CELL_TYPE_STRING).setCellValue(settle.getString("client_order_id"));
-                row.createCell(2, Cell.CELL_TYPE_STRING).setCellValue(DateFormatUtils.format(settle.getDate("transaction_time"),"yyyy-MM-dd hh:mm:ss"));
+                Calendar calendar = (Calendar) settle.get("transaction_time");
+                row.createCell(2, Cell.CELL_TYPE_STRING).setCellValue(DateFormatUtils.format(calendar, "yyyy-MM-dd HH:mm:ss",calendar.getTimeZone()));
                 row.createCell(3, Cell.CELL_TYPE_STRING).setCellValue(settle.getString("channel"));
                 if (settle.getInteger("gateway") != null) {
                     row.createCell(4, Cell.CELL_TYPE_STRING).setCellValue(TradeType.fromGatewayNumber(settle.getIntValue("gateway")).getTradeType());