Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -20,6 +20,10 @@
   // 券图片

   @Expose

    private String couponPicture;

	
   // 券图片- 失效

    private String couponPictureInvalid;

	
   // 券作用

   @Expose

    private String couponEffect;

@@ -113,4 +117,12 @@
      this.inUseExplain = inUseExplain;

   }



   public String getCouponPictureInvalid() {

      return couponPictureInvalid;

   }



   public void setCouponPictureInvalid(String couponPictureInvalid) {

      this.couponPictureInvalid = couponPictureInvalid;

   }



}