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 | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 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 d1b56e7..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
@@ -3,32 +3,29 @@
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 javax.persistence.Transient;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
-@Entity
-@Table(name = "yeshi_ec_hot_search")
+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`")
+
private Integer orderby;
- @Column(name = "`name`")
+ @Column(name = "name")
+
private String name;
+
private Long createtime;
- @Transient
// 绯荤粺鍏宠仈鍒楄〃
- private List<com.yeshi.fanli.entity.system.System> systemList;
+ private List<BusinessSystem> systemList;
public HotSearch() {
}
@@ -76,11 +73,11 @@
this.name = name;
}
- 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