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 | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 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 841e30b..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,27 @@
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;
import com.yeshi.fanli.entity.system.BusinessSystem;
-@Entity
-@Table(name = "yeshi_ec_hot_search")
+@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<BusinessSystem> systemList;
--
Gitblit v1.8.0