From 207dc8655711cddac2653e18b51e58a88dba2084 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 06 三月 2020 18:14:36 +0800
Subject: [PATCH] 发圈处理

---
 fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java |   42 +++++++++++++++++++++++++++++++++++++++---
 1 files changed, 39 insertions(+), 3 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 552a603..ef39fe8 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;// 姝e父
 	public static int STATE_OFFLINE = 1;// 涓嬬嚎
@@ -37,6 +41,8 @@
 	private BigDecimal rate;
 	@Column(name = "cg_picture")
 	private String picture;
+	@Column(name = "cg_picture_white")
+	private String pictureWhite;
 	@Column(name = "cg_state")
 	private Integer state;
 	@Column(name = "cg_price")
@@ -55,17 +61,22 @@
 	private String videoCover;
 	@Column(name = "cg_video_url")
 	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_createtime")
 	private Date createTime;
 	@Column(name = "cg_updatetime")
 	private Date updateTime;
 
-	public CommonGoods() {}
-	
+	public CommonGoods() {
+	}
+
 	public CommonGoods(Long id) {
 		this.id = id;
 	}
-	
+
 	public Long getId() {
 		return id;
 	}
@@ -88,6 +99,14 @@
 
 	public void setGoodsId(Long goodsId) {
 		this.goodsId = goodsId;
+	}
+
+	public Integer getMaterialLibType() {
+		return materialLibType;
+	}
+
+	public void setMaterialLibType(Integer materialLibType) {
+		this.materialLibType = materialLibType;
 	}
 
 	public Integer getGoodsType() {
@@ -233,4 +252,21 @@
 	public void setVideoUrl(String videoUrl) {
 		this.videoUrl = videoUrl;
 	}
+
+	public String getPictureWhite() {
+		return pictureWhite;
+	}
+
+	public void setPictureWhite(String pictureWhite) {
+		this.pictureWhite = pictureWhite;
+	}
+
+	public String getOtherInfo() {
+		return otherInfo;
+	}
+
+	public void setOtherInfo(String otherInfo) {
+		this.otherInfo = otherInfo;
+	}
+	
 }

--
Gitblit v1.8.0