From 5a37edc8cb5e4fb62e374d55b504843d2f5a4a6c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 七月 2020 11:14:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/QualityFactory.java | 67 +++++++++++----------------------
1 files changed, 22 insertions(+), 45 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/QualityFactory.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/QualityFactory.java
index d186880..b1b66d8 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/QualityFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/QualityFactory.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;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -23,19 +16,21 @@
*
* @date 2018骞�7鏈�3鏃�
*/
-@Entity
-@Table(name = "yeshi_ec_quality_factory")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_quality_factory")
-public class QualityFactory implements Serializable{
+@Table("yeshi_ec_quality_factory")
+public class QualityFactory implements Serializable{
+ /**
+ *
+ */
private static final long serialVersionUID = 1L;
-
// 浜哄伐绛涢�夊叆搴�
public final static int MODE_MANUAL = 1;
// 绯荤粺绠楁硶 -鑷姩鍏ュ簱
public final static int MODE_SYSTEM = 2;
// 鑷姩鍏ュ簱
public final static int MODE_AUTO = 3;
+
+
// 鏉ユ簮-娣樺疂
public final static int SOURCE_TAOBAO = 1;
@@ -53,60 +48,42 @@
public final static int SOURCE_OTHER = 5;
- @Id
+
+
@Column(name = "sg_id")
- @GeneratedValue(strategy = GenerationType.AUTO)
- @org.yeshi.utils.mybatis.Column(name = "sg_id")
private Long id;
-
- @JoinColumn(name = "sg_class_id")
- @org.yeshi.utils.mybatis.Column(name = "sg_class_id")
+ @Column(name = "sg_class_id")
private Long systemCid; // 鍟嗗搧绫荤洰id
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "sg_goods_id")
- @org.yeshi.utils.mybatis.Column(name = "sg_goods_id")
+ @Column(name = "sg_goods_id")
private TaoBaoGoodsBrief taoBaoGoodsBrief;// 鍟嗗搧id
-
- @JoinColumn(name = "sg_entry_mode")
- @org.yeshi.utils.mybatis.Column(name = "sg_entry_mode")
+ @Column(name = "sg_entry_mode")
private Integer entryMode; // 褰曞叆鏂瑰紡
- @JoinColumn(name = "sg_goods_source")
- @org.yeshi.utils.mybatis.Column(name = "sg_goods_source")
+ @Column(name = "sg_goods_source")
private Integer goodsSource; // 鍟嗗搧鏉ユ簮
- @JoinColumn(name = "sg_source_calss")
- @org.yeshi.utils.mybatis.Column(name = "sg_source_calss")
+ @Column(name = "sg_source_calss")
private String sourceCalss; // 鏉ユ簮鍏蜂綋绫荤洰
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "sg_rule_id")
- @org.yeshi.utils.mybatis.Column(name = "sg_rule_id")
+ @Column(name = "sg_rule_id")
private BoutiqueAutoRule boutiqueAutoRule; // 褰曞叆鏂瑰紡
- @JoinColumn(name = "sg_weight")
- @org.yeshi.utils.mybatis.Column(name = "sg_weight")
+ @Column(name = "sg_weight")
private Integer weight; // 鍟嗗搧鏉冮噸 -- 鎺掑簭
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "sg_create_aid")
- @org.yeshi.utils.mybatis.Column(name = "sg_create_aid")
+ @Column(name = "sg_create_aid")
private AdminUser createUser; // 鍒涘缓浜�
- @JoinColumn(name = "sg_createtime")
- @org.yeshi.utils.mybatis.Column(name = "sg_createtime")
+ @Column(name = "sg_createtime")
private Date createtime; // 鍒涘缓鏃堕棿
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "sg_update_aid")
- @org.yeshi.utils.mybatis.Column(name = "sg_update_aid")
+ @Column(name = "sg_update_aid")
private AdminUser updateUser; // 淇敼浜�
- @JoinColumn(name = "sg_updatetime")
- @org.yeshi.utils.mybatis.Column(name = "sg_updatetime")
+ @Column(name = "sg_updatetime")
private Date updatetime; // 鏇存柊鏃堕棿
public Long getId() {
--
Gitblit v1.8.0