Merge remote-tracking branch 'origin/master'

admin

2018-12-12 263d995ed175dc8260b0f830751db376221e4ac9

 fanli/src/main/java/com/yeshi/fanli/entity/bus/share/UserShareGoodsRecord.java

@@ -48,6 +48,11 @@
   @Column(name = "sgr_picture")

   private String picture;

   

   // 显示标题内容

   @Expose

   @Column(name = "sgr_title")

   private String title;

	
   // 分享时间

   @Column(name = "sgr_createtime")

   private Date createTime;

@@ -207,5 +212,13 @@
   public void setRevenueMoney(BigDecimal revenueMoney) {

      this.revenueMoney = revenueMoney;

   }



   public String getTitle() {

      return title;

   }



   public void setTitle(String title) {

      this.title = title;

   }

   

}