From 9a24f2802a3d6fe3e82c05e52f2880d65ad04dcf Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 29 四月 2019 08:59:47 +0800
Subject: [PATCH] Merge branch 'div_develop' into master_develop
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/search/HotSearch.java | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/search/HotSearch.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/search/HotSearch.java
index 5047a5a..9d57461 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/search/HotSearch.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/search/HotSearch.java
@@ -1,46 +1,50 @@
package com.yeshi.fanli.entity.bus.search;
import java.io.Serializable;
+import java.util.List;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
-@Entity
-@Table(name = "yeshi_ec_hot_search")
-public class HotSearch implements Serializable{
-
+import com.yeshi.fanli.entity.system.BusinessSystem;
+
+@Table("yeshi_ec_hot_search")
+public class HotSearch implements Serializable {
+
private static final long serialVersionUID = 1L;
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
+
@Column(name = "id")
private Long id;
- @Column(name="`orderby`")
+ @Column(name = "`orderby`")
+
private Integer orderby;
- @Column(name="`name`")
+ @Column(name = "name")
+
private String name;
+
private Long createtime;
+
+ // 绯荤粺鍏宠仈鍒楄〃
+ private List<BusinessSystem> systemList;
+
public HotSearch() {
}
-
+
public HotSearch(Long id) {
super();
this.id = id;
}
-
+
public HotSearch(Integer orderby, String name) {
super();
this.orderby = orderby;
this.name = name;
}
-
+
public Long getCreatetime() {
return createtime;
}
-
+
public void setCreatetime(Long createtime) {
this.createtime = createtime;
}
@@ -48,20 +52,33 @@
public Long getId() {
return id;
}
+
public void setId(Long id) {
this.id = id;
}
+
public Integer getOrderby() {
return orderby;
}
+
public void setOrderby(Integer orderby) {
this.orderby = orderby;
}
+
public String getName() {
return name;
}
+
public void setName(String name) {
this.name = name;
}
-
+
+ public List<BusinessSystem> getSystemList() {
+ return systemList;
+ }
+
+ public void setSystemList(List<BusinessSystem> systemList) {
+ this.systemList = systemList;
+ }
+
}
--
Gitblit v1.8.0