From eed607d87b2eee1f09b4a28da614f3ad0b46601d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 16:14:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/taobao/ScanHistory.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/ScanHistory.java b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/ScanHistory.java
index eb94d9d..53f4418 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/ScanHistory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/ScanHistory.java
@@ -17,7 +17,7 @@
import org.hibernate.annotations.Type;
import com.google.gson.annotations.Expose;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
/**
* 娴忚瓒宠
@@ -39,7 +39,7 @@
@ManyToOne(fetch = FetchType.EAGER)
@JoinColumn(name = "systemid")
- private System system;
+ private BusinessSystem system;
private Long uid; //鐢ㄦ埛id
@@ -59,11 +59,11 @@
this.device = device;
}
- 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