From bd331a582851cffcce54316e677e23760de4f384 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 24 六月 2019 11:36:49 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java | 1 +
1 files changed, 1 insertions(+), 0 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 58c0a34..1fa1fd4 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
@@ -10,6 +10,7 @@
public class CommonGoods {
public static int GOODS_TYPE_TB = 1;// 娣樺疂澶╃尗
public static int GOODS_TYPE_JD = 2;// 浜笢
+ public static int GOODS_TYPE_PDD = 3;// 鎷煎澶�
public static int SHOP_TYPE_TB = 1;// 娣樺疂
public static int SHOP_TYPE_TM = 2;// 澶╃尗
--
Gitblit v1.8.0