Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

 fanli/src/main/java/com/yeshi/fanli/vo/user/UserSystemCouponVO.java

@@ -58,6 +58,10 @@
   @Expose

    private List<String> tips;

   

   // 赠送中-分享口令

   @Expose

    private String giveTips;

	
   



   public String getTopPicture() {

@@ -164,4 +168,11 @@
      this.popup = popup;

   }



   public String getGiveTips() {

      return giveTips;

   }



   public void setGiveTips(String giveTips) {

      this.giveTips = giveTips;

   }

}