From e6764831a890de26fcfebb4fb8f3a22e9f8cc816 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 27 八月 2019 16:09:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div

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

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java
index 1e9646e..71b1630 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Order.java
@@ -33,6 +33,7 @@
 
 	public final static int ORDER_TYPE_TAOBAO = 1;// 娣樺疂
 	public final static int ORDER_TYPE_JINGDONG = 2;// 浜笢
+	public final static int ORDER_TYPE_PDD = 3;// 鎷煎澶�
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)

--
Gitblit v1.8.0