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/bus/su/search/SuperHotSearch.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/su/search/SuperHotSearch.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/su/search/SuperHotSearch.java
index 143bcf8..31bc66d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/su/search/SuperHotSearch.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/su/search/SuperHotSearch.java
@@ -13,7 +13,7 @@
import javax.persistence.Table;
import com.yeshi.fanli.entity.bus.search.HotSearch;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
@Entity
@@ -32,7 +32,7 @@
@JoinColumn(name="system_id")
@ManyToOne(fetch = FetchType.EAGER)
- private System system;
+ private BusinessSystem system;
@JoinColumn(name="hotSearch_id")
@ManyToOne(fetch = FetchType.EAGER)
@@ -41,7 +41,7 @@
public SuperHotSearch() {
}
- public SuperHotSearch(System system, HotSearch hotSearch) {
+ public SuperHotSearch(BusinessSystem system, HotSearch hotSearch) {
super();
this.system = system;
this.hotSearch = hotSearch;
@@ -55,11 +55,11 @@
this.id = id;
}
- 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