From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Extract.java |   94 ++++++++++++++++++++++++----------------------
 1 files changed, 49 insertions(+), 45 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Extract.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Extract.java
index acad8b3..a496f54 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Extract.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Extract.java
@@ -3,18 +3,11 @@
 import java.math.BigDecimal;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
 
 import com.google.gson.annotations.Expose;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
 
 /**
  * 鎻愮幇璁板綍
@@ -23,51 +16,62 @@
  *
  * @date 2018骞�1鏈�29鏃�
  */
-@Entity
-@Table(name = "yeshi_ec_extract")
+@Table("yeshi_ec_extract")
 public class Extract {
 	public static int STATE_NOT_PROCESS = 0;// 鏈鐞�
 	public static int STATE_PASS = 1;// 閫氳繃
 	public static int STATE_REJECT = 2;// 鎷掔粷
 	public static int STATE_PROCESSING = 3;// 姝ｅ湪澶勭悊
 
-	@Id
-	@GeneratedValue(strategy = GenerationType.AUTO)
-	@Column(name = "`id`")
+	@Column(name = "id")
 	private Long id;
-
-	@ManyToOne(fetch = FetchType.EAGER)
-	@JoinColumn(name = "uid")
-	@org.yeshi.utils.mybatis.Column(name = "uid")
+	
+	@Column(name = "uid")
 	private UserInfo userInfo;// 鐢ㄦ埛
+	
+	@Column(name = "sid")
+	private BusinessSystem system;
 
-	private String account;// 搴勬埛
-
-	private String name;// 鎻愮幇鍚嶇О
-
-	private Integer type;// 鎻愮幇绫诲瀷
-
-	private BigDecimal money;// 鎻愮幇閲戦
-
-	private Long extractTime;
-
-	private String ip;
-
-	private Integer state;
-
-	private String reason;
-
-	@ManyToOne(fetch = FetchType.EAGER)
-	@JoinColumn(name = "sid")
-	private System system;
-
-	@Column(name = "adminId")
 	@Expose
-	@org.yeshi.utils.mybatis.Column(name = "adminId")
+	@Column(name = "adminId")
 	private Long adminId; // 浠诲姟id 鐩墠榛樿鍊�
 	
-	//TODO 绛夊緟娣诲姞瀛楁
-	private Date receiveTime;//鍒拌处鏃堕棿
+	@Column(name = "account")
+	private String account;// 搴勬埛
+
+	@Column(name = "name")
+	private String name;// 鎻愮幇鍚嶇О
+
+	@Column(name = "type")
+	private Integer type;// 鎻愮幇绫诲瀷
+
+	@Column(name = "money")
+	private BigDecimal money;// 鎻愮幇閲戦
+
+	@Column(name = "extractTime")
+	private Long extractTime;
+
+	@Column(name = "ip")
+	private String ip;
+
+	@Column(name = "state")
+	private Integer state;
+
+	@Column(name = "reason")
+	private String reason;
+
+	
+
+	public Extract(Long id) {
+		this.id = id;
+	}
+	public Extract() {
+	
+	}
+	
+	
+	// TODO 绛夊緟娣诲姞瀛楁
+	private Date receiveTime;// 鍒拌处鏃堕棿
 
 	public Date getReceiveTime() {
 		return receiveTime;
@@ -85,11 +89,11 @@
 		this.adminId = adminId;
 	}
 
-	public System getSystem() {
+	public BusinessSystem getSystem() {
 		return system;
 	}
 
-	public void setSystem(System system) {
+	public void setSystem(BusinessSystem system) {
 		this.system = system;
 	}
 

--
Gitblit v1.8.0