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/MsgMoneyDetail.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
index 75407c9..19b8c7a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgMoneyDetail.java
@@ -44,6 +44,8 @@
 	private Integer goodsCount;// 鍟嗗搧鏁�
 	@Column(name = "mm_order_id")
 	private String orderId;// 璁㈠崟鍙凤紙杩斿埄閫傜敤锛�
+	@Column(name = "mm_order_type")
+	private Integer orderType;
 	@Column(name = "mm_source_id")
 	private Extract extract;// 鎻愮幇璇︽儏
 	private AlipayAccountValidNormalHistory alipayAccountValid;// 鎻愮幇璐﹀彿楠岃瘉璇︽儏
@@ -182,4 +184,12 @@
 		this.alipayAccountValid = alipayAccountValid;
 	}
 
+	public Integer getOrderType() {
+		return orderType;
+	}
+
+	public void setOrderType(Integer orderType) {
+		this.orderType = orderType;
+	}
+
 }

--
Gitblit v1.8.0