From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 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..7cee102 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,9 +10,13 @@
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;// 澶╃尗
+ 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;// 涓嬬嚎
@@ -59,6 +63,11 @@
private String videoUrl;
@Column(name = "cg_material_lib_type")
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")
@@ -254,4 +263,21 @@
public void setPictureWhite(String pictureWhite) {
this.pictureWhite = pictureWhite;
}
+
+ public String getOtherInfo() {
+ return otherInfo;
+ }
+
+ 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