Merge branch 'main' of http://122.51.230.86:3000/dianliang/oil-station into main

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeApplet/entity/ActiveApplet.java

@@ -5,6 +5,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -13,7 +15,7 @@ import java.io.Serializable;
  * @author makejava
  * @since 2024-03-11 15:28:10
  */
-@SuppressWarnings("serial")
+@Data
 public class ActiveApplet extends Model<ActiveApplet> {
     //主键id
     @TableId(type = IdType.AUTO)
@@ -40,8 +42,10 @@ public class ActiveApplet extends Model<ActiveApplet> {
     private String time;
     //类型
     private String type;
-    //活动时间
+    //名称
     private String name;
+    //已领数量
+    private Integer sendNum;
     //活动id
     private Integer activeId;
     //创建者
@@ -52,160 +56,5 @@ public class ActiveApplet extends Model<ActiveApplet> {
     private String updateBy;
     //更新时间
     private Date updateTime;
-
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getChainStoreId() {
-        return chainStoreId;
-    }
-
-    public void setChainStoreId(Integer chainStoreId) {
-        this.chainStoreId = chainStoreId;
-    }
-
-    public Integer getStoreId() {
-        return storeId;
-    }
-
-    public void setStoreId(Integer storeId) {
-        this.storeId = storeId;
-    }
-
-    public String getIsonline() {
-        return isonline;
-    }
-
-    public void setIsonline(String isonline) {
-        this.isonline = isonline;
-    }
-
-    public String getActiveStatus() {
-        return activeStatus;
-    }
-
-    public void setActiveStatus(String activeStatus) {
-        this.activeStatus = activeStatus;
-    }
-
-    public String getAdaptUserType() {
-        return adaptUserType;
-    }
-
-    public void setAdaptUserType(String adaptUserType) {
-        this.adaptUserType = adaptUserType;
-    }
-
-    public String getDiscountActiveDescribe() {
-        return discountActiveDescribe;
-    }
-
-    public void setDiscountActiveDescribe(String discountActiveDescribe) {
-        this.discountActiveDescribe = discountActiveDescribe;
-    }
-
-    public Integer getGrowaValue() {
-        return growaValue;
-    }
-
-    public void setGrowaValue(Integer growaValue) {
-        this.growaValue = growaValue;
-    }
-
-    public String getOilName() {
-        return oilName;
-    }
-
-    public void setOilName(String oilName) {
-        this.oilName = oilName;
-    }
-
-    public Integer getPoints() {
-        return points;
-    }
-
-    public void setPoints(Integer points) {
-        this.points = points;
-    }
-
-    public String getTime() {
-        return time;
-    }
-
-    public void setTime(String time) {
-        this.time = time;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getActiveId() {
-        return activeId;
-    }
-
-    public void setActiveId(Integer activeId) {
-        this.activeId = activeId;
-    }
-
-    public String getCreateBy() {
-        return createBy;
-    }
-
-    public void setCreateBy(String createBy) {
-        this.createBy = createBy;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateBy() {
-        return updateBy;
-    }
-
-    public void setUpdateBy(String updateBy) {
-        this.updateBy = updateBy;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    /**
-     * 获取主键值
-     *
-     * @return 主键值
-     */
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
     }