Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 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; // 精选id

	
   // 取消数据区分时间段：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() {