From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/entity/taobao/dataoke/DaTaoKeDetail.java | 6 +++---
1 files changed, 3 insertions(+), 3 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..9ac794f 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
@@ -75,7 +75,7 @@
private BigDecimal commissionJiHua;// 璁″垝(閫氱敤)浣ｉ噾姣斾緥
@Column(name = "que_siteid")
@SerializedName("Que_siteid")
- private Integer queSiteId;
+ private String queSiteId;
@Column(name = "commission")
@SerializedName("Commission")
private BigDecimal commission;// 浣ｉ噾
@@ -263,11 +263,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