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

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOtherDetail.java

@@ -28,8 +28,9 @@
      couponActivate("免单券激活","http://img.flqapp.com/resource/msg/icon_msg_other_coupon.png"),

      taoLiJin("推广红包","http://img.flqapp.com/resource/msg/icon_msg_other_tlj.png"),

      taoLiJinExchange("推广红包兑换金币","http://img.flqapp.com/resource/msg/icon_msg_other_system_give.png"),

      give("赠送",""),

      give("赠送","http://img.flqapp.com/resource/msg/icon_msg_other_integral.png"),

      exchange("金币兑换","http://img.flqapp.com/resource/msg/icon_msg_other_integral.png"),

      goldCoin("金币","http://img.flqapp.com/resource/msg/icon_msg_other_integral.png"),

      firstOrderReward("粉丝首单奖励邀请人金币","http://img.flqapp.com/resource/msg/icon_msg_other_integral.png"),

      systemGive("系统赠送","http://img.flqapp.com/resource/msg/icon_msg_other_system_give.png"),

      passVIPApply("超级会员","http://img.flqapp.com/resource/msg/icon_msg_vip.png"),

@@ -73,6 +74,10 @@
   private Date createTime;

   @Column(name = "mo_update_time")

   private Date updateTime;

	
   private String extraInfo;

	
	


   // 券内容

   private MsgOtherCouponContentDTO coupnContent;

@@ -189,4 +194,12 @@
   public void setExchangeContent(MsgOtherExchangeContentDTO exchangeContent) {

      this.exchangeContent = exchangeContent;

   }



   public String getExtraInfo() {

      return extraInfo;

   }



   public void setExtraInfo(String extraInfo) {

      this.extraInfo = extraInfo;

   }

}