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/TaoBaoShop.java | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoShop.java b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoShop.java
index 6f94ad7..3171935 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoShop.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoShop.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.entity.taobao;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@@ -15,14 +16,19 @@
*
*/
@Table("yeshi_ec_taobao_shop_info")
-public class TaoBaoShop {
+public class TaoBaoShop implements Serializable {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
@Expose
@Column(name = "tsi_id")
private Long id;// 鍗栧ID
@Expose
@Column(name = "tsi_user_type")
- private Integer userType;// 鐢ㄦ埛绫诲瀷 0-娣樺疂 1-澶╃尗
+ private Integer userType;// 鐢ㄦ埛绫诲瀷 0-娣樺疂 1-澶╃尗
@Expose
@Column(name = "tsi_shop_id")
@@ -34,6 +40,10 @@
@Column(name = "tsi_seller_nick")
private String sellerNick;// 鍗栧鏄�
+
+ @Expose
+ @Column(name = "tsi_shop_name_custom")
+ private String shopNameCustom;// 鑷畾涔夊簵閾哄悕绉�
@Expose
@Column(name = "tsi_shop_icon")
@@ -58,9 +68,11 @@
@Column(name = "tsi_score_goods_d")
private BigDecimal scoreGoodsD;// 涓庤涓氬钩鍧囧垎鐨勫樊鍊�
+ @Expose
@Column(name = "tsi_score_seller_d")
private BigDecimal scoreSellerD;
+ @Expose
@Column(name = "tsi_score_logistics_d")
private BigDecimal scoreLogisticsD;
@@ -71,8 +83,12 @@
@Column(name = "tsi_update_time")
private Date updateTime;
- // 搴楅摵閾炬帴
- private String shopLink;
+ @Expose
+ @Column(name = "tsi_shop_link")
+ private String shopLink; // 搴楅摵閾炬帴
+
+ @Column(name = "tsi_key")
+ private String key; // 鍏抽敭璇�
public TaoBaoShop() {}
@@ -211,4 +227,20 @@
this.shopLink = shopLink;
}
+ public String getShopNameCustom() {
+ return shopNameCustom;
+ }
+
+ public void setShopNameCustom(String shopNameCustom) {
+ this.shopNameCustom = shopNameCustom;
+ }
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
}
--
Gitblit v1.8.0