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/homemodule/SpecialCard.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialCard.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialCard.java
index d5eb526..11fc338 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialCard.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialCard.java
@@ -13,6 +13,8 @@
import javax.persistence.Table;
import javax.persistence.Transient;
+import com.yeshi.fanli.entity.system.BusinessSystem;
+
/**
* 涓撻鏍囪瘑绠＄悊
*
@@ -63,7 +65,7 @@
private Long totalSpecial;
@Transient // 绯荤粺鍏宠仈鍒楄〃
- private List<com.yeshi.fanli.entity.system.System> systemList;
+ private List<BusinessSystem> systemList;
@@ -107,11 +109,11 @@
this.updatetime = updatetime;
}
- public List<com.yeshi.fanli.entity.system.System> getSystemList() {
+ public List<BusinessSystem> getSystemList() {
return systemList;
}
- public void setSystemList(List<com.yeshi.fanli.entity.system.System> systemList) {
+ public void setSystemList(List<BusinessSystem> systemList) {
this.systemList = systemList;
}
--
Gitblit v1.8.0