From e4a56b57d3e10b9b46eaefe5194bbf98fcc45698 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 11 七月 2019 18:41:09 +0800
Subject: [PATCH] Merge branch 'master' into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java b/fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java
index 3091245..e68b53a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java
@@ -14,10 +14,9 @@
 
 	public static int SHOP_TYPE_TB = 1;// 娣樺疂
 	public static int SHOP_TYPE_TM = 2;// 澶╃尗
-	public static int SHOP_TYPE_JD = 20;
-	public static int SHOP_TYPE_JD_SELF = 21;
-	public static int SHOP_TYPE_PDD = 30;
-	
+	public static int SHOP_TYPE_JD = 20;// 浜笢
+	public static int SHOP_TYPE_JD_SELF = 21;// 浜笢鑷惀
+	public static int SHOP_TYPE_PDD = 30;// 鎷煎澶�
 
 	public static int STATE_NORMAL = 0;// 姝ｅ父
 	public static int STATE_OFFLINE = 1;// 涓嬬嚎

--
Gitblit v1.8.0