Merge remote-tracking branch 'origin/master'

src/main/java/com/diaoyun/zion/chinafrica/entity/TbCfCouponEntity.java

@@ -17,7 +17,11 @@ import java.util.Date;
 @ApiModel
 public class TbCfCouponEntity implements Serializable {
     private static final long serialVersionUID = 1L;
-
+    /**
+     *优惠券发放表id
+     */
+    @ApiModelProperty("优惠券发放表id")
+    private String couponIssuetableId;
     /**
      * 优惠券id
      */
@@ -411,4 +415,16 @@ public class TbCfCouponEntity implements Serializable {
     public Date getUpdateTime() {
         return updateTime;
     }
+    /**
+     * 获取：优惠券发放表id
+     */
+    public String getCouponIssuetableId() {
+        return couponIssuetableId;
+    }
+    /**
+     * 设置：优惠券发放表id
+     */
+    public void setCouponIssuetableId(String couponIssuetableId) {
+        this.couponIssuetableId = couponIssuetableId;
+    }
 }