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

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap.properties

@@ -10,7 +10,7 @@ kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket
 kylin_order_ticket_entities.add=INSERT INTO kylin_order_ticket_entities(order_ticket_entities_id ,order_id ,ticket_id ,user_id ,time_id ,performance_id ,enter_type ,enter_name ,enter_mobile,enter_id_code,`status`,sys_damai,check_client,is_payment,`comment`,created_at,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 
 # ------------------------再次支付----------------------------
-kylin_order_ticket.payAgain=UPDATE kylin_order_tickets SET order_code = ? , updated_at = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_ticket.payAgain=UPDATE kylin_order_tickets SET  updated_at = ? , order_code = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
 kylin_order_ticket_status.payAgain=UPDATE kylin_order_ticket_status SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
 kylin_order_ticket_relation.payAgain=UPDATE kylin_order_ticket_relations SET updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)