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/bus/lable/Label.java | 51 +++++++++++++++------------------------------------
1 files changed, 15 insertions(+), 36 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/Label.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/Label.java
index f40404c..a0d1e18 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/Label.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/Label.java
@@ -3,15 +3,8 @@
import java.io.Serializable;
import java.util.Date;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
+import org.yeshi.utils.mybatis.Column;
+import org.yeshi.utils.mybatis.Table;
import com.yeshi.fanli.entity.common.AdminUser;
@@ -22,15 +15,14 @@
*
* @date 2018骞�6鏈�27鏃�
*/
-@Entity
-@Table(name = "yeshi_ec_label")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_label")
-public class Label implements Serializable{
+@Table("yeshi_ec_label")
+public class Label implements Serializable {
/**
*
*/
private static final long serialVersionUID = 1L;
+
// 鍚庡彴褰曞叆
public final static int MODE_BACKSTAGE = 1;
// excel瀵煎叆
@@ -38,48 +30,35 @@
// 绯荤粺鏁版嵁鎶撳彇
public final static int MODE_SYSTEM = 3;
- @Id
+
@Column(name = "lab_id")
- @GeneratedValue(strategy = GenerationType.AUTO)
- @org.yeshi.utils.mybatis.Column(name = "lab_id")
private Long id;
- @JoinColumn(name = "lab_title")
- @org.yeshi.utils.mybatis.Column(name = "lab_title")
+ @Column(name = "lab_title")
private String title;// 鍚嶇О
- @JoinColumn(name = "lab_picture")
- @org.yeshi.utils.mybatis.Column(name = "lab_picture")
+ @Column(name = "lab_picture")
private String picture; // 鍥剧墖url
- @JoinColumn(name = "lab_ios_click")
- @org.yeshi.utils.mybatis.Column(name = "lab_ios_click")
+ @Column(name = "lab_ios_click")
private Long iosClick; // 鐐瑰嚮娆℃暟
- @JoinColumn(name = "lab_android_click")
- @org.yeshi.utils.mybatis.Column(name = "lab_android_click")
+ @Column(name = "lab_android_click")
private Long androidClick; // 鐐瑰嚮娆℃暟
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "lab_entry_aid")
- @org.yeshi.utils.mybatis.Column(name = "lab_entry_aid")
+ @Column(name = "lab_entry_aid")
private AdminUser createUser; // 褰曞叆浜�
- @JoinColumn(name = "lab_entry_mode")
- @org.yeshi.utils.mybatis.Column(name = "lab_entry_mode")
+ @Column(name = "lab_entry_mode")
private Integer entrymode; // 褰曞叆鏂瑰紡 (1 浜哄伐褰曞叆銆�2 绯荤粺鑷姩褰曞叆銆�3 鎼滅储褰曞叆)
- @JoinColumn(name = "lab_remark")
- @org.yeshi.utils.mybatis.Column(name = "lab_remark")
+ @Column(name = "lab_remark")
private String remark; // 澶囨敞
-
- @JoinColumn(name = "lab_createtime")
- @org.yeshi.utils.mybatis.Column(name = "lab_createtime")
+ @Column(name = "lab_createtime")
private Date createtime; // 鍒涘缓鏃堕棿
- @JoinColumn(name = "lab_updatetime")
- @org.yeshi.utils.mybatis.Column(name = "lab_updatetime")
+ @Column(name = "lab_updatetime")
private Date updatetime; // 鏇存柊鏃堕棿锛堜慨鏀规椂闂达級
--
Gitblit v1.8.0