java/QianYunTong.git

			@@ -4,8 +4,8 @@
			import com.baomidou.mybatisplus.annotations.TableId;
			import com.baomidou.mybatisplus.annotations.TableName;
			import com.baomidou.mybatisplus.enums.IdType;
			import com.stylefeng.guns.modular.system.model.BaseBean;

			import java.math.BigDecimal;
			import java.util.Date;

			/**
			@@ -356,7 +356,111 @@
			@TableField("bindId")
			private String bindId;

			/**
			* 是否异常订单 1否 2是
			*/
			@TableField("abnormal")
			private Integer abnormal;


			/**
			* 乘客反馈情况
			*/
			@TableField("abnormalIntro")
			private String abnormalIntro;

			/**
			* 乘客反馈图片
			*/
			@TableField("abnormalImg")
			private String abnormalImg;


			private Integer promotionDriverId;

			private BigDecimal promotionMoney;


			private String splitAllocation;

			private Integer responsibilityType;


			private Integer promotion;

			private String voice;


			private Date voiceTime;

			private String promotionUser;

			private String promotionPhone;

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

			private Long promotionActivityId;

			public Long getPromotionActivityId() {
			return promotionActivityId;
			}

			public void setPromotionActivityId(Long promotionActivityId) {
			this.promotionActivityId = promotionActivityId;
			}


			public Integer getResponsibilityType() {
			return responsibilityType;
			}

			public void setResponsibilityType(Integer responsibilityType) {
			this.responsibilityType = responsibilityType;
			}

			public Integer getPromotionDriverId() {
			return promotionDriverId;
			}

			public void setPromotionDriverId(Integer promotionDriverId) {
			this.promotionDriverId = promotionDriverId;
			}

			public BigDecimal getPromotionMoney() {
			return promotionMoney;
			}

			public void setPromotionMoney(BigDecimal promotionMoney) {
			this.promotionMoney = promotionMoney;
			}

			public Integer getAbnormal() {
			return abnormal;
			}

			public void setAbnormal(Integer abnormal) {
			this.abnormal = abnormal;
			}

			public String getAbnormalIntro() {
			return abnormalIntro;
			}

			public void setAbnormalIntro(String abnormalIntro) {
			this.abnormalIntro = abnormalIntro;
			}

			public String getAbnormalImg() {
			return abnormalImg;
			}

			public void setAbnormalImg(String abnormalImg) {
			this.abnormalImg = abnormalImg;
			}

			public Integer getId() {
			return id;
			@@ -910,7 +1014,63 @@
			public void setSplitAllocation(String splitAllocation) {
			this.splitAllocation = splitAllocation;
			}


			public Integer getPromotion() {
			return promotion;
			}

			public void setPromotion(Integer promotion) {
			this.promotion = promotion;
			}

			public String getVoice() {
			return voice;
			}

			public void setVoice(String voice) {
			this.voice = voice;
			}

			public Date getVoiceTime() {
			return voiceTime;
			}

			public void setVoiceTime(Date voiceTime) {
			this.voiceTime = voiceTime;
			}

			public String getPromotionUser() {
			return promotionUser;
			}

			public void setPromotionUser(String promotionUser) {
			this.promotionUser = promotionUser;
			}

			public String getPromotionPhone() {
			return promotionPhone;
			}

			public void setPromotionPhone(String promotionPhone) {
			this.promotionPhone = promotionPhone;
			}

			public String getTravelId() {
			return travelId;
			}

			public void setTravelId(String travelId) {
			this.travelId = travelId;
			}

			public Integer getIsCreated() {
			return isCreated;
			}

			public void setIsCreated(Integer isCreated) {
			this.isCreated = isCreated;
			}

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