From 51a4ff5d777028d52a19c314a99f796334cb7b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 23 十一月 2019 18:30:01 +0800
Subject: [PATCH] 配置文件修改

---
 fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoWeiQuanOrder.java |   32 ++++++++++++++++++++------------
 1 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoWeiQuanOrder.java b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoWeiQuanOrder.java
index 8ac6149..d9033fd 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoWeiQuanOrder.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoWeiQuanOrder.java
@@ -32,26 +32,34 @@
 	@Column(name = "tmo_state")
 	private String state;
 	@Column(name = "tmo_jiesuan_time")
-	private String jieSuanTime;
+	private Date jieSuanTime;
 	@Column(name = "tmo_weiquan_time")
-	private String weiQuanTime;
+	private Date weiQuanTime;
 	@Column(name = "tmo_weiquan_finish_time")
-	private String weiQuanFinishTime;
+	private Date weiQuanFinishTime;
 	@Column(name = "tmo_createtime")
 	private Date createTime;// 鍒涘缓鏃堕棿
 	@Column(name = "tmo_updatetime")
 	private Date updateTime;// 鏈湴鏇存柊鏃堕棿
-
+	@Column(name = "tmo_settlement")
+	private BigDecimal settlement;// 缁撶畻閲戦
 	@Transient
 	private int mate; // 鏄惁宸插尮閰�
-	
-	
+
 	public Long getId() {
 		return id;
 	}
 
 	public void setId(Long id) {
 		this.id = id;
+	}
+
+	public BigDecimal getSettlement() {
+		return settlement;
+	}
+
+	public void setSettlement(BigDecimal settlement) {
+		this.settlement = settlement;
 	}
 
 	public Date getCreateTime() {
@@ -118,27 +126,27 @@
 		this.state = state;
 	}
 
-	public String getJieSuanTime() {
+	public Date getJieSuanTime() {
 		return jieSuanTime;
 	}
 
-	public void setJieSuanTime(String jieSuanTime) {
+	public void setJieSuanTime(Date jieSuanTime) {
 		this.jieSuanTime = jieSuanTime;
 	}
 
-	public String getWeiQuanTime() {
+	public Date getWeiQuanTime() {
 		return weiQuanTime;
 	}
 
-	public void setWeiQuanTime(String weiQuanTime) {
+	public void setWeiQuanTime(Date weiQuanTime) {
 		this.weiQuanTime = weiQuanTime;
 	}
 
-	public String getWeiQuanFinishTime() {
+	public Date getWeiQuanFinishTime() {
 		return weiQuanFinishTime;
 	}
 
-	public void setWeiQuanFinishTime(String weiQuanFinishTime) {
+	public void setWeiQuanFinishTime(Date weiQuanFinishTime) {
 		this.weiQuanFinishTime = weiQuanFinishTime;
 	}
 

--
Gitblit v1.8.0