Merge branch 'f-6.7.0' into lichong-dev

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/order/OpOrderQuery.java

@@ -40,6 +40,7 @@ public class OpOrderQuery extends AbstractPagedQuery {
     private Date departureStartDate;
     private Date departureStartDate;
     private Date departureEndDate;
     private Date departureEndDate;
     private Integer paymentVersion;
     private Integer paymentVersion;
+    private Integer orderId;
 
 
     /**
     /**
      * 是否被接管
      * 是否被接管
@@ -304,5 +305,13 @@ public class OpOrderQuery extends AbstractPagedQuery {
 		this.recommendPhone = recommendPhone;
 		this.recommendPhone = recommendPhone;
 	}
 	}
 
 
+	public Integer getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(Integer orderId) {
+		this.orderId = orderId;
+	}
+
 	
 	
 }
 }