Merge branch 'mj' into dev

netflix-dao/src/main/java/com/cyksj/model/views/RenewalView.java

@@ -148,6 +148,8 @@ public class RenewalView {
 
     @DbIgnore
     private String orderNo;
+    @DbIgnore
+    private Long orderId;
 
     @DbIgnore
     private String transactionId;

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -190,6 +190,7 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 					.last("limit 1"));
 			if (orderDon != null) {
 				ticket.setOrderNo(orderDon.getOrderNo());
+				ticket.setOrderId(orderDon.getId());
 				ticket.setTransactionId(orderDon.getTransactionId());
 			}