From f617136cba7f851a32f6091d5adc3e80f0e224c2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 24 一月 2019 09:33:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java | 17 ++++++++++++++---
1 files changed, 14 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..dc1ae7f 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
@@ -37,6 +37,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")
@@ -60,12 +62,13 @@
@Column(name = "cg_updatetime")
private Date updateTime;
- public CommonGoods() {}
-
+ public CommonGoods() {
+ }
+
public CommonGoods(Long id) {
this.id = id;
}
-
+
public Long getId() {
return id;
}
@@ -233,4 +236,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