From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 27 八月 2019 12:32:46 +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/order/CommonOrderGoods.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java b/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java
index 756805e..e285d34 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java
@@ -23,9 +23,10 @@
 	private static final long serialVersionUID = 1L;
 
 	// 娣樺疂
-	public final static int TYPE_TAOBAO = 1;
-	// 浜笢
-	public final static int TYPE_JINGDONG = 2;
+	public final static String TYPE_TAOBAO = "TB";
+	// 澶╃尗
+	public final static String TYPE_TMALL = "TM";
+		
 
 	@Column(name = "cog_id")
 	private Long id;

--
Gitblit v1.8.0