From 3a6e476b2f498e876ff10f1328455f58e63ee85a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 04 四月 2019 09:30:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/user/Extract.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 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..15589f4 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
@@ -14,7 +14,7 @@
import javax.persistence.Table;
import com.google.gson.annotations.Expose;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
/**
* 鎻愮幇璁板綍
@@ -35,6 +35,13 @@
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "`id`")
private Long id;
+
+ public Extract(Long id) {
+ this.id = id;
+ }
+ public Extract() {
+
+ }
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "uid")
@@ -59,15 +66,15 @@
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "sid")
- private System system;
+ private BusinessSystem system;
@Column(name = "adminId")
@Expose
@org.yeshi.utils.mybatis.Column(name = "adminId")
private Long adminId; // 浠诲姟id 鐩墠榛樿鍊�
-
- //TODO 绛夊緟娣诲姞瀛楁
- private Date receiveTime;//鍒拌处鏃堕棿
+
+ // TODO 绛夊緟娣诲姞瀛楁
+ private Date receiveTime;// 鍒拌处鏃堕棿
public Date getReceiveTime() {
return receiveTime;
@@ -85,11 +92,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