From dd6a31aae79b35ccf0e006704a4d9e1d950c57d6 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 23 五月 2020 09:55:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 7cee102..9c468ed 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
@@ -11,12 +11,16 @@
public static int GOODS_TYPE_TB = 1;// 娣樺疂澶╃尗
public static int GOODS_TYPE_JD = 2;// 浜笢
public static int GOODS_TYPE_PDD = 3;// 鎷煎澶�
+ public static int GOODS_TYPE_VIP = 4;// 鍞搧浼�
+ public static int GOODS_TYPE_SUNING = 5;// 鑻忓畞
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_VIP = 40;//鍞搧浼氳嚜钀�
+
public static int STATE_NORMAL = 0;// 姝ｅ父
public static int STATE_OFFLINE = 1;// 涓嬬嚎
@@ -67,7 +71,7 @@
private String otherInfo; // 鍟嗗搧鍏朵粬淇℃伅-json瀛楃涓�
@Column(name = "cg_category_info")
private String categoryInfo; // 鍟嗗搧鍒嗙被淇℃伅
-
+
@Column(name = "cg_createtime")
private Date createTime;
@Column(name = "cg_updatetime")
@@ -279,5 +283,5 @@
public void setCategoryInfo(String categoryInfo) {
this.categoryInfo = categoryInfo;
}
-
+
}
--
Gitblit v1.8.0