From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 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..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;// 澶╃尗
@@ -37,6 +38,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 +58,20 @@
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_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 +94,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 +247,12 @@
public void setVideoUrl(String videoUrl) {
this.videoUrl = videoUrl;
}
+
+ public String getPictureWhite() {
+ return pictureWhite;
+ }
+
+ public void setPictureWhite(String pictureWhite) {
+ this.pictureWhite = pictureWhite;
+ }
}
--
Gitblit v1.8.0