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/taobao/TaoBaoGoodsBrief.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBrief.java b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBrief.java
index 2d4afcb..6cb9667 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBrief.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoGoodsBrief.java
@@ -5,7 +5,6 @@
import java.util.Date;
import java.util.List;
-import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Transient;
@@ -23,10 +22,9 @@
* @author Administrator
*
*/
-@Entity
@org.yeshi.utils.mybatis.Table("yeshi_ec_taobao_goods")
@Document(collection="taoBaoGoodsCache")
-public class TaoBaoGoodsBrief implements Serializable {
+public class TaoBaoGoodsBrief extends TaoBaoGoodsYuShouInfo implements Serializable {
/**
@@ -85,7 +83,6 @@
@Expose
private String title;// 鍟嗗搧鏍囬
-
@Field
@Indexed
@org.yeshi.utils.mybatis.Column(name = "auctionId")
@@ -287,10 +284,25 @@
@Transient
private Integer materialLibType;//鐗╂枡搴撶被鍨�
+ private String description;//鎺ㄨ崘璇�
+
+ @Transient
+ private boolean shopCoupon;//鏄惁涓哄簵閾哄埜
+
/* 鏂板瀛楁 2018-7-16 锛� 鐢变簬鏁版嵁鏈粠娣樺疂鑾峰彇鎴愬姛锛屾殏涓嶅惎鐢� */
+
+
+ public boolean isShopCoupon() {
+ return shopCoupon;
+ }
+
+ public void setShopCoupon(boolean shopCoupon) {
+ this.shopCoupon = shopCoupon;
+ }
+
public Integer getMaterialLibType() {
return materialLibType;
}
@@ -890,4 +902,12 @@
this.pictUrlWhite = pictUrlWhite;
}
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
}
--
Gitblit v1.8.0