Merge branch 'master' of zyh/kmall-haikong into master

kmall-admin/src/main/java/com/kmall/admin/entity/mk/MkActivitiesPresentIntegralEntity.java

@@ -1,6 +1,7 @@
 package com.kmall.admin.entity.mk;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -29,7 +30,7 @@ public class MkActivitiesPresentIntegralEntity implements Serializable {
     /**
      * 赠送数值
      */
-    private Integer activityGiveNum;
+    private BigDecimal activityGiveNum;
     /**
      * 门店编号
      */
@@ -121,14 +122,14 @@ public class MkActivitiesPresentIntegralEntity implements Serializable {
     /**
      * 设置：赠送数值
      */
-    public void setActivityGiveNum(Integer activityGiveNum) {
+    public void setActivityGiveNum(BigDecimal activityGiveNum) {
         this.activityGiveNum = activityGiveNum;
     }
 
     /**
      * 获取：赠送数值
      */
-    public Integer getActivityGiveNum() {
+    public BigDecimal getActivityGiveNum() {
         return activityGiveNum;
     }
     /**