From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/QualityFlashSale.java | 66 ++++++++++----------------------
1 files changed, 21 insertions(+), 45 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/QualityFlashSale.java b/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/QualityFlashSale.java
index 364e465..60bc6bf 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/QualityFlashSale.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/bus/lable/QualityFlashSale.java
@@ -1,17 +1,11 @@
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.taobao.TaoBaoGoodsBrief;
/**
* 绮鹃�夊簱锛氶檺鏃舵姠璐�
@@ -20,44 +14,26 @@
*
* @date 2018骞�9鏈�18鏃�
*/
-@Entity
-@Table(name = "yeshi_ec_quality_flash_sale")
-@org.yeshi.utils.mybatis.Table("yeshi_ec_quality_flash_sale")
-public class QualityFlashSale implements Serializable{
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
+@Table("yeshi_ec_quality_flash_sale")
+public class QualityFlashSale {
- @Id
@Column(name = "fs_id")
- @GeneratedValue(strategy = GenerationType.AUTO)
- @org.yeshi.utils.mybatis.Column(name = "fs_id")
private Long id;
- @ManyToOne(fetch = FetchType.EAGER)
- @JoinColumn(name = "fs_qfgoods_id")
- @org.yeshi.utils.mybatis.Column(name = "fs_qfgoods_id")
- private QualityFactory qualityFactory; // 绮鹃�塱d
-
- // 鍙栨秷鏁版嵁鍖哄垎鏃堕棿娈碉細1(00:00) 2(09:00) 3(12:00) 4(14:00) 5(16:00) 6(20:00) 7(22:00)
- @JoinColumn(name = "fs_type")
- @org.yeshi.utils.mybatis.Column(name = "fs_type")
+ @Column(name = "fs_qfgoods_id")
+ private TaoBaoGoodsBrief taoBaoGoodsBrief;// 鍟嗗搧id
+
+ // 鍙栨秷鏁版嵁鍖哄垎鏃堕棿娈碉細1(00:00) 2(09:00) 3(12:00) 4(14:00) 5(16:00) 6(20:00) 7(22:00)
+ @Column(name = "fs_type")
private Integer type; // 鏆傚仠鐢�
-
-
- @JoinColumn(name = "fs_weight")
- @org.yeshi.utils.mybatis.Column(name = "fs_weight")
+
+ @Column(name = "fs_weight")
private Double weight; // 鍟嗗搧鏉冮噸 -- 鎺掑簭
-
-
- @JoinColumn(name = "fs_createtime")
- @org.yeshi.utils.mybatis.Column(name = "fs_createtime")
+
+ @Column(name = "fs_createtime")
private Date createtime; // 鍒涘缓鏃堕棿
-
- @JoinColumn(name = "fs_updatetime")
- @org.yeshi.utils.mybatis.Column(name = "fs_updatetime")
+
+ @Column(name = "fs_updatetime")
private Date updatetime; // 鏇存柊鏃堕棿
public Long getId() {
@@ -68,12 +44,12 @@
this.id = id;
}
- public QualityFactory getQualityFactory() {
- return qualityFactory;
+ public TaoBaoGoodsBrief getTaoBaoGoodsBrief() {
+ return taoBaoGoodsBrief;
}
- public void setQualityFactory(QualityFactory qualityFactory) {
- this.qualityFactory = qualityFactory;
+ public void setTaoBaoGoodsBrief(TaoBaoGoodsBrief taoBaoGoodsBrief) {
+ this.taoBaoGoodsBrief = taoBaoGoodsBrief;
}
public Integer geTtype() {
--
Gitblit v1.8.0