From 8e825039f9e55e7b3ff0bae9f9f671c9503f6af8 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@S0ZHK00LKCA6OYY>
Date: 星期六, 10 十一月 2018 10:55:10 +0800
Subject: [PATCH] Merge branch 'master' of ssh://admin@193.112.35.168:29418/fanli-server.git
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/homemodule/SpecialCard.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 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 c4d1533..d5eb526 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
@@ -2,6 +2,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -10,6 +11,7 @@
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.Table;
+import javax.persistence.Transient;
/**
* 涓撻鏍囪瘑绠＄悊
@@ -42,6 +44,11 @@
@org.yeshi.utils.mybatis.Column(name = "cd_card")
private String card;
+ // 鍖归厤鏍囪瘑
+ @JoinColumn(name = "cd_state")
+ @org.yeshi.utils.mybatis.Column(name = "cd_state")
+ private Integer state;
+
// 鍒涘缓鏃堕棿
@JoinColumn(name = "cd_createtime")
@org.yeshi.utils.mybatis.Column(name = "cd_createtime")
@@ -51,6 +58,13 @@
@JoinColumn(name = "cd_updatetime")
@org.yeshi.utils.mybatis.Column(name = "cd_updatetime")
private Date updatetime;
+
+ @Transient
+ private Long totalSpecial;
+
+ @Transient // 绯荤粺鍏宠仈鍒楄〃
+ private List<com.yeshi.fanli.entity.system.System> systemList;
+
public Long getId() {
@@ -91,6 +105,30 @@
public void setUpdatetime(Date updatetime) {
this.updatetime = updatetime;
+ }
+
+ public List<com.yeshi.fanli.entity.system.System> getSystemList() {
+ return systemList;
+ }
+
+ public void setSystemList(List<com.yeshi.fanli.entity.system.System> systemList) {
+ this.systemList = systemList;
+ }
+
+ public Long getTotalSpecial() {
+ return totalSpecial;
+ }
+
+ public void setTotalSpecial(Long totalSpecial) {
+ this.totalSpecial = totalSpecial;
+ }
+
+ public Integer getState() {
+ return state;
+ }
+
+ public void setState(Integer state) {
+ this.state = state;
}
}
--
Gitblit v1.8.0