From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 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