Merge remote-tracking branch 'origin/master'

admin

2019-01-24 f617136cba7f851a32f6091d5adc3e80f0e224c2

 fanli/src/main/java/com/yeshi/fanli/entity/goods/CommonGoods.java

@@ -37,6 +37,8 @@
   private BigDecimal rate;

   @Column(name = "cg_picture")

   private String picture;

   @Column(name = "cg_picture_white")

   private String pictureWhite;

   @Column(name = "cg_state")

   private Integer state;

   @Column(name = "cg_price")

@@ -60,12 +62,13 @@
   @Column(name = "cg_updatetime")

   private Date updateTime;



   public CommonGoods() {}

	
   public CommonGoods() {

   }



   public CommonGoods(Long id) {

      this.id = id;

   }

	


   public Long getId() {

      return id;

   }

@@ -233,4 +236,12 @@
   public void setVideoUrl(String videoUrl) {

      this.videoUrl = videoUrl;

   }



   public String getPictureWhite() {

      return pictureWhite;

   }



   public void setPictureWhite(String pictureWhite) {

      this.pictureWhite = pictureWhite;

   }

}