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/LabelClass.java |   41 +++++++++--------------------------------
 1 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/LabelClass.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/LabelClass.java
index 0440033..339ca50 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/LabelClass.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/LabelClass.java
@@ -1,17 +1,9 @@
 package com.yeshi.fanli.entity.bus.lable;
 
-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.bus.clazz.GoodsClass;
 import com.yeshi.fanli.entity.bus.clazz.GoodsSubClass;
@@ -23,40 +15,25 @@
  *
  * @date 2018骞�6鏈�27鏃�
  */
-@Entity
-@Table(name = "yeshi_ec_label_")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_label_class")
-public class LabelClass implements Serializable{
+@Table("yeshi_ec_label_")
+public class LabelClass {
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
 
-	@Id
 	@Column(name = "lc_id")
-	@GeneratedValue(strategy = GenerationType.AUTO)
-	@org.yeshi.utils.mybatis.Column(name = "lc_id")
 	private Long id;
 
-	@ManyToOne(fetch = FetchType.EAGER)
-	@JoinColumn(name = "lc_label_id")
-	@org.yeshi.utils.mybatis.Column(name = "lc_label_id")
+	@Column(name = "lc_label_id")
 	private Label label; // 鏍囩id
 
-	@ManyToOne(fetch = FetchType.EAGER)
-	@JoinColumn(name = "lc_class_id")
-	@org.yeshi.utils.mybatis.Column(name = "lc_class_id")
+	@Column(name = "lc_class_id")
 	private GoodsClass goodClass;// 鍟嗗搧澶х被
 
-	@ManyToOne(fetch = FetchType.EAGER)
-	@JoinColumn(name = "lc_subclass_id")
-	@org.yeshi.utils.mybatis.Column(name = "lc_subclass_id")
+	@Column(name = "lc_subclass_id")
 	private GoodsSubClass goodsSubClass; // 鍟嗗搧瀛愮被
 
-	@JoinColumn(name = "lc_createtime")
-	@org.yeshi.utils.mybatis.Column(name = "lc_createtime")
+	@Column(name = "lc_createtime")
 	private Date createtime; // 鍒涘缓鏃堕棿
+	
 
 	public Long getId() {
 		return id;

--
Gitblit v1.8.0