From 1011d9d0aaab0e978caf4513b64f0a369bcd9a96 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 22 七月 2019 15:39:56 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java
index 8f569a1..7754fe0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java
@@ -42,6 +42,8 @@
 	private MsgTypeOrderTypeEnum type;// 娑堟伅绫诲瀷
 	@Column(name = "mo_order_id")
 	private String orderId;// 璁㈠崟鍙�
+	@Column(name = "mo_order_type")
+	private Integer orderType;// 璁㈠崟绫诲瀷
 	@Column(name = "mo_state")
 	private Integer state;// 鐘舵��
 	@Column(name = "mo_goods_count")
@@ -165,4 +167,12 @@
 		this.happendDate = happendDate;
 	}
 
+	public Integer getOrderType() {
+		return orderType;
+	}
+
+	public void setOrderType(Integer orderType) {
+		this.orderType = orderType;
+	}
+
 }

--
Gitblit v1.8.0