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/clazz/SuperGoodsClass.java |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/su/clazz/SuperGoodsClass.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/su/clazz/SuperGoodsClass.java
index 5dcb370..637e56a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/su/clazz/SuperGoodsClass.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/su/clazz/SuperGoodsClass.java
@@ -13,7 +13,7 @@
 import javax.persistence.Table;
 
 import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
 
 @Entity
 @Table(name = "yeshi_ec_super_goodsclass")
@@ -33,13 +33,12 @@
 	private GoodsClass goodsClass;
 	@ManyToOne(fetch = FetchType.EAGER)
 	@JoinColumn(name = "system_id")
-	private System system;
+	private BusinessSystem system;
 
 	public SuperGoodsClass() {
-		// TODO Auto-generated constructor stub
 	}
 	
-	public SuperGoodsClass(GoodsClass goodsClass, System system) {
+	public SuperGoodsClass(GoodsClass goodsClass, BusinessSystem system) {
 		super();
 		this.goodsClass = goodsClass;
 		this.system = system;
@@ -61,11 +60,11 @@
 		this.goodsClass = goodsClass;
 	}
 
-	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