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/TaoBaoLink.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoLink.java b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoLink.java
index 248a95b..d7cae5f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoLink.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/taobao/TaoBaoLink.java
@@ -10,7 +10,7 @@
import javax.persistence.Table;
import javax.persistence.Transient;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
@Entity
@Table(name="yeshi_ec_taobao_link")
@@ -28,7 +28,7 @@
@ManyToOne
@JoinColumn(name="sid")
- private System system;
+ private BusinessSystem system;
/**
* 娣樺疂token
@@ -76,11 +76,11 @@
this.taoToken = taoToken;
}
- 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