From d8359ddb48dab5cc797a9d552e11fde571f4920c Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期二, 27 八月 2019 12:32:46 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/entity/taobao/dataoke/DaTaoKeDetail.java | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/dataoke/DaTaoKeDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/dataoke/DaTaoKeDetail.java index b6133e4..5ddb029 100644 --- a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/dataoke/DaTaoKeDetail.java +++ b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/dataoke/DaTaoKeDetail.java @@ -1,5 +1,6 @@ package com.yeshi.fanli.entity.taobao.dataoke; +import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @@ -15,10 +16,25 @@ * */ @Table("yeshi_ec_goods_dataoke") -public class DaTaoKeDetail { +public class DaTaoKeDetail implements Serializable{ + + /** + * + */ + private static final long serialVersionUID = 1L; + + public DaTaoKeDetail(Long id) { + this.id = id; + } + + public DaTaoKeDetail() { + } + @Column(name = "id") @SerializedName("ID") private Long id;// 澶ф窐瀹D + + @Column(name = "d_title") @SerializedName("D_title") private String dTitle;// 鍟嗗搧鐭爣棰� @@ -75,7 +91,7 @@ private BigDecimal commissionJiHua;// 璁″垝(閫氱敤)浣i噾姣斾緥 @Column(name = "que_siteid") @SerializedName("Que_siteid") - private Integer queSiteId; + private String queSiteId; @Column(name = "commission") @SerializedName("Commission") private BigDecimal commission;// 浣i噾 @@ -263,11 +279,11 @@ this.commissionJiHua = commissionJiHua; } - public Integer getQueSiteId() { + public String getQueSiteId() { return queSiteId; } - public void setQueSiteId(Integer queSiteId) { + public void setQueSiteId(String queSiteId) { this.queSiteId = queSiteId; } -- Gitblit v1.8.0