From 554de444b87aab5f93cb1593a8095612cf9479a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 09 六月 2020 17:34:30 +0800
Subject: [PATCH] 订单

---
 fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 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 ef39fe8..88de016 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,19 @@
 	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 SHOP_TYPE_SUNING = 50;//鑻忓畞
+	public static int SHOP_TYPE_SUNING_SELF = 51;//鑻忓畞鑷惀
+	
 
 	public static int STATE_NORMAL = 0;// 姝e父
 	public static int STATE_OFFLINE = 1;// 涓嬬嚎
@@ -65,6 +72,9 @@
 	private Integer materialLibType;// 鐗╂枡搴撶被鍨� 1-钀ラ攢鍟嗗搧搴� 0-闈炶惀閿�鍟嗗搧搴�
 	@Column(name = "cg_other_info")
 	private String otherInfo; // 鍟嗗搧鍏朵粬淇℃伅-json瀛楃涓�
+	@Column(name = "cg_category_info")
+	private String categoryInfo; // 鍟嗗搧鍒嗙被淇℃伅
+
 	@Column(name = "cg_createtime")
 	private Date createTime;
 	@Column(name = "cg_updatetime")
@@ -268,5 +278,13 @@
 	public void setOtherInfo(String otherInfo) {
 		this.otherInfo = otherInfo;
 	}
-	
+
+	public String getCategoryInfo() {
+		return categoryInfo;
+	}
+
+	public void setCategoryInfo(String categoryInfo) {
+		this.categoryInfo = categoryInfo;
+	}
+
 }

--
Gitblit v1.8.0