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

@@ -5,6 +5,8 @@
import org.yeshi.utils.mybatis.Column;

import org.yeshi.utils.mybatis.Table;



import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;



/**

 * 精选库：限时抢购

 * 

@@ -14,26 +16,23 @@
 */

@Table("yeshi_ec_quality_flash_sale")

public class QualityFlashSale {

	


   @Column(name = "fs_id")

   private Long id;



   @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)  
   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; // 暂停用

	
	


   @Column(name = "fs_weight")

   private Double weight; // 商品权重 -- 排序

	
	


   @Column(name = "fs_createtime")

   private Date createtime; // 创建时间

	


   @Column(name = "fs_updatetime")

   private Date updatetime; // 更新时间



@@ -45,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() {