Merge branch 'mater-1.6.0' into div

admin

2019-08-23 d1bcc87e41d8d176ce58ee9e27a17ec93d0d7cb2

 fanli/src/main/java/com/yeshi/fanli/entity/system/SystemCoupon.java

@@ -22,8 +22,8 @@


   // 券类型

   public enum CouponTypeEnum {

      freeCoupon("免单"), welfareFreeCoupon("福利免单"), rebatePercentCoupon("返利比提成奖励券");



      freeCoupon("免单券"), welfareFreeCoupon("福利免单"), rebatePercentCoupon("返利比提成奖励券"),

      freeCouponBuy("自购免单券"),freeCouponGive("赠送免单券");

      private final String desc;



      private CouponTypeEnum(String desc) {

@@ -74,13 +74,14 @@
   @Column(name = "sc_rule")

   private String rule;



   // 规则

   @Column(name = "sc_rule_link")

   private String ruleLink;



	
   // 备注说明

   @Column(name = "sc_remark")

   private String remark;



   // 领取数量

   @Column(name = "sc_receive_count")

   private Integer receiveCount;



   // 状态 0未启用 1已启用

   @Column(name = "sc_state")

@@ -173,14 +174,6 @@
      this.remark = remark;

   }



   public Integer getReceiveCount() {

      return receiveCount;

   }



   public void setReceiveCount(Integer receiveCount) {

      this.receiveCount = receiveCount;

   }



   public Integer getState() {

      return state;

   }

@@ -220,5 +213,13 @@
   public void setPictureInvalid(String pictureInvalid) {

      this.pictureInvalid = pictureInvalid;

   }



   public String getRuleLink() {

      return ruleLink;

   }



   public void setRuleLink(String ruleLink) {

      this.ruleLink = ruleLink;

   }

   

}