From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/common/JumpDetail.java | 35 +++++++++++++++--------------------
1 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/common/JumpDetail.java b/fanli/src/main/java/com/yeshi/fanli/entity/common/JumpDetail.java
index 826efac..7c0ee5b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/common/JumpDetail.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/common/JumpDetail.java
@@ -2,12 +2,8 @@
import java.io.Serializable;
-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;
/**
* 鍓嶇璺宠浆璇︽儏
@@ -15,37 +11,36 @@
* @author Administrator
*
*/
-@Entity
-@Table(name = "`yeshi_ec_action_jumpdetail`")
-public class JumpDetail implements Serializable{
-
+@Table("`yeshi_ec_action_jumpdetail`")
+public class JumpDetail implements Serializable {
+
/**
*
*/
- private static final long serialVersionUID = 1L;
-
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
+ private static final Long serialVersionUID = 1L;
+
@Column(name = "id")
- private long id;
+ private Long id;
+ @Column(name = "name")
private String name;
+ @Column(name = "activity")
private String activity;
+ @Column(name = "controller")
private String controller;
public JumpDetail() {
- // TODO Auto-generated constructor stub
}
-
- public JumpDetail(long id) {
+
+ public JumpDetail(Long id) {
super();
this.id = id;
}
- public long getId() {
+ public Long getId() {
return id;
}
- public void setId(long id) {
+ public void setId(Long id) {
this.id = id;
}
--
Gitblit v1.8.0