java/QianYunTong.git

			@@ -317,6 +317,7 @@
			private Integer invoiceId;
			/**
			* 是否是改派单（1=否，=是）
			*
			* @return
			*/
			@TableField("isReassign")
			@@ -328,6 +329,7 @@
			private Integer reassignNotice;
			/**
			* 高德猎鹰轨迹id
			*
			* @return
			*/
			@TableField("trackId")
			@@ -339,18 +341,21 @@
			private Integer isDelete;
			/**
			* 该派前的订单状态
			*
			* @return
			*/
			@TableField("oldState")
			private Integer oldState;
			/**
			* 移动小号
			*
			* @return
			*/
			@TableField("telX")
			private String telX;
			/**
			* 绑定小号关系id
			*
			* @return
			*/
			@TableField("bindId")
			@@ -397,13 +402,19 @@

			private String promotionPhone;

			private Long promotionActivityId;
			/**
			* 中台行程id
			*/
			private String travelId;
			/**
			* 中台是否已创建订单（0=否，1=是）
			*/
			private Integer isCreated;

			private Long promotionActivityId;
			/**
			* 是否是追缴单（0=否，1=是）
			*/
			private Integer recoveryOrder;

			public Long getPromotionActivityId() {
			return promotionActivityId;
			@@ -1071,6 +1082,14 @@
			this.isCreated = isCreated;
			}

			public Integer getRecoveryOrder() {
			return recoveryOrder;
			}

			public void setRecoveryOrder(Integer recoveryOrder) {
			this.recoveryOrder = recoveryOrder;
			}

			@Override
			public String toString() {
			return "OrderTaxi{" +