From 9c09cead959dbeef292628f345e5f80c30fc3d17 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 19 八月 2019 17:42:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mater-1.6.0' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/pdd/PDDOrder.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/pdd/PDDOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/pdd/PDDOrder.java
index 07049bd..cc023e4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/pdd/PDDOrder.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/pdd/PDDOrder.java
@@ -72,6 +72,9 @@
 	@SerializedName("order_modify_at")
 	@Column(name = "po_order_modify_at")
 	private Long orderModifyAt;// 鏈�鍚庢洿鏂版椂闂�
+	@SerializedName("order_receive_time")
+	@Column(name = "po_order_receive_time")
+	private Long orderReceiveTime;//鏀惰揣鏃堕棿
 	@SerializedName("custom_parameters")
 	@Column(name = "po_custom_parameters")
 	private String customParameters;// 鑷畾涔夊弬鏁�
@@ -277,4 +280,13 @@
 	public void setOrderId(String orderId) {
 		this.orderId = orderId;
 	}
+
+	public Long getOrderReceiveTime() {
+		return orderReceiveTime;
+	}
+
+	public void setOrderReceiveTime(Long orderReceiveTime) {
+		this.orderReceiveTime = orderReceiveTime;
+	}
+
 }

--
Gitblit v1.8.0