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/system/SystemConfig.java | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemConfig.java b/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemConfig.java
index 87a9dc5..34f6a50 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemConfig.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/system/SystemConfig.java
@@ -3,7 +3,6 @@
import java.util.HashSet;
import java.util.Set;
-import javax.persistence.CascadeType;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -14,10 +13,6 @@
import javax.persistence.JoinTable;
import javax.persistence.ManyToMany;
import javax.persistence.Table;
-
-import org.hibernate.annotations.Cascade;
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
/**
* 绯荤粺閰嶇疆鍙傛暟
@@ -34,7 +29,7 @@
private long id;
@ManyToMany(fetch = FetchType.EAGER)
@JoinTable(name="yeshi_ec_system_systemconfig",joinColumns=@JoinColumn(name="scid",referencedColumnName="id"),inverseJoinColumns=@JoinColumn(name="sid",referencedColumnName="id"))
- private Set<System> systems=new HashSet<System>();
+ private Set<BusinessSystem> systems=new HashSet<BusinessSystem>();
@Column(name = "`key`", length = 50)
private String key;
@Column(name = "`value`", length = 1024)
@@ -60,11 +55,11 @@
this.id = id;
}
- public Set<System> getSystems() {
+ public Set<BusinessSystem> getSystems() {
return systems;
}
- public void setSystems(Set<System> systems) {
+ public void setSystems(Set<BusinessSystem> systems) {
this.systems = systems;
}
--
Gitblit v1.8.0