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/admin/GoodsClassAdmin.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/admin/GoodsClassAdmin.java b/fanli/src/main/java/com/yeshi/fanli/entity/admin/GoodsClassAdmin.java
index ecbd161..933d57b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/admin/GoodsClassAdmin.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/admin/GoodsClassAdmin.java
@@ -4,10 +4,11 @@
import java.util.List;
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
+import com.yeshi.fanli.entity.system.BusinessSystem;
public class GoodsClassAdmin {
private GoodsClass goodsClass;
- private final List<com.yeshi.fanli.entity.system.System> systemList=new ArrayList<com.yeshi.fanli.entity.system.System>();
+ private final List<BusinessSystem> systemList=new ArrayList<BusinessSystem>();
public GoodsClassAdmin() {
// TODO Auto-generated constructor stub
@@ -24,7 +25,7 @@
public void setGoodsClass(GoodsClass goodsClass) {
this.goodsClass = goodsClass;
}
- public List<com.yeshi.fanli.entity.system.System> getSystemList() {
+ public List<BusinessSystem> getSystemList() {
return systemList;
}
--
Gitblit v1.8.0