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

yujian

2020-05-23 dd6a31aae79b35ccf0e006704a4d9e1d950c57d6

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

@@ -31,6 +31,20 @@
   private String sharePDDTextTemplate;// 拼多多无券分享模板

   @Column(name = "st_share_pdd_text_template_coupon")

   private String sharePDDTextTemplateCoupon;// 拼多多有券分享模板

   @Column(name = "st_share_vip_text_template")

   private String shareVIPTextTemplate;// 唯品会无券分享模板

	
	
	
	
   public String getShareVIPTextTemplate() {

      return shareVIPTextTemplate;

   }



   public void setShareVIPTextTemplate(String shareVIPTextTemplate) {

      this.shareVIPTextTemplate = shareVIPTextTemplate;

   }



   @Column(name = "st_create_time")

   private Date createTime;

   @Column(name = "st_update_time")