From c389b1ca090df256bad7fd0d183914146c1f93b8 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 12 四月 2019 12:15:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/su/clazz/SuperGoodsClass.java | 47 +++++++++++++++++------------------------------
1 files changed, 17 insertions(+), 30 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/su/clazz/SuperGoodsClass.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/su/clazz/SuperGoodsClass.java
index 637e56a..bd0ca87 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/su/clazz/SuperGoodsClass.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/su/clazz/SuperGoodsClass.java
@@ -1,54 +1,41 @@
package com.yeshi.fanli.entity.bus.su.clazz;
-import java.io.Serializable;
-
-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.system.BusinessSystem;
-@Entity
-@Table(name = "yeshi_ec_super_goodsclass")
-public class SuperGoodsClass implements Serializable{
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
-
- @Id
- @GeneratedValue(strategy = GenerationType.AUTO)
+@Table("yeshi_ec_super_goodsclass")
+public class SuperGoodsClass {
+
@Column(name = "id")
- private long id;
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "goodsclass_id")
+ private Long id;
+
+ @Column(name = "goodsclass_id")
private GoodsClass goodsClass;
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "system_id")
+
+ @Column(name = "system_id")
private BusinessSystem system;
+
+
public SuperGoodsClass() {
}
-
+
public SuperGoodsClass(GoodsClass goodsClass, BusinessSystem system) {
super();
this.goodsClass = goodsClass;
this.system = system;
}
+
+
- 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