From af335bf1ef9104dc62c721e142eca790356d18b6 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 02 四月 2025 09:42:25 +0800
Subject: [PATCH] 修改bug

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityHistory.java |  257 +++++++++++++++++++++++++++------------------------
 1 files changed, 137 insertions(+), 120 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityHistory.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityHistory.java
index f6d81f7..403be38 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityHistory.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityHistory.java
@@ -1,10 +1,14 @@
 package com.stylefeng.guns.modular.system.model;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.enums.IdType;
+
 import java.util.Date;
+
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+
 import java.io.Serializable;
 
 /**
@@ -17,124 +21,137 @@
  */
 @TableName("t_driver_activity_history")
 public class DriverActivityHistory extends Model<DriverActivityHistory> {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-    /**
-     * 活动日期
-     */
-    private Date day;
-    /**
-     * 司机id
-     */
-    private Integer driverId;
-    /**
-     * 活动类型(1=邀请司机注册,2=邀请用户注册,3=累计在线,4=订单量)
-     */
-    private Integer type;
-    /**
-     * 活动id
-     */
-    private Integer activityId;
-    /**
-     * 是否完成(1=未完成,2=已完成)
-     */
-    private Integer carryOut;
-    /**
-     * 奖励金额
-     */
-    private Double money;
-    /**
-     * 添加时间
-     */
-    private Date insertTime;
-
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Date getDay() {
-        return day;
-    }
-
-    public void setDay(Date day) {
-        this.day = day;
-    }
-
-    public Integer getDriverId() {
-        return driverId;
-    }
-
-    public void setDriverId(Integer driverId) {
-        this.driverId = driverId;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public Integer getActivityId() {
-        return activityId;
-    }
-
-    public void setActivityId(Integer activityId) {
-        this.activityId = activityId;
-    }
-
-    public Integer getCarryOut() {
-        return carryOut;
-    }
-
-    public void setCarryOut(Integer carryOut) {
-        this.carryOut = carryOut;
-    }
-
-    public Double getMoney() {
-        return money;
-    }
-
-    public void setMoney(Double money) {
-        this.money = money;
-    }
-
-    public Date getInsertTime() {
-        return insertTime;
-    }
-
-    public void setInsertTime(Date insertTime) {
-        this.insertTime = insertTime;
-    }
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-    @Override
-    public String toString() {
-        return "DriverActivityHistory{" +
-        "id=" + id +
-        ", day=" + day +
-        ", driverId=" + driverId +
-        ", type=" + type +
-        ", activityId=" + activityId +
-        ", carryOut=" + carryOut +
-        ", money=" + money +
-        ", insertTime=" + insertTime +
-        "}";
-    }
+	
+	private static final long serialVersionUID = 1L;
+	
+	/**
+	 * 主键
+	 */
+	@TableId(value = "id", type = IdType.AUTO)
+	private Integer id;
+	/**
+	 * 活动日期
+	 */
+	private Date day;
+	/**
+	 * 司机id
+	 */
+	private Integer driverId;
+	/**
+	 * 活动类型(1=邀请司机注册,2=邀请用户注册,3=累计在线,4=订单量)
+	 */
+	private Integer type;
+	/**
+	 * 活动id
+	 */
+	private Integer activityId;
+	/**
+	 * 是否完成(1=未完成,2=已完成)
+	 */
+	private Integer carryOut;
+	/**
+	 * 奖励金额
+	 */
+	private Double money;
+	/**
+	 * 添加时间
+	 */
+	private Date insertTime;
+	/**
+	 * 完成时间
+	 */
+	@TableField("completionTime")
+	private Date completionTime;
+	
+	
+	public Integer getId() {
+		return id;
+	}
+	
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	
+	public Date getDay() {
+		return day;
+	}
+	
+	public void setDay(Date day) {
+		this.day = day;
+	}
+	
+	public Integer getDriverId() {
+		return driverId;
+	}
+	
+	public void setDriverId(Integer driverId) {
+		this.driverId = driverId;
+	}
+	
+	public Integer getType() {
+		return type;
+	}
+	
+	public void setType(Integer type) {
+		this.type = type;
+	}
+	
+	public Integer getActivityId() {
+		return activityId;
+	}
+	
+	public void setActivityId(Integer activityId) {
+		this.activityId = activityId;
+	}
+	
+	public Integer getCarryOut() {
+		return carryOut;
+	}
+	
+	public void setCarryOut(Integer carryOut) {
+		this.carryOut = carryOut;
+	}
+	
+	public Double getMoney() {
+		return money;
+	}
+	
+	public void setMoney(Double money) {
+		this.money = money;
+	}
+	
+	public Date getInsertTime() {
+		return insertTime;
+	}
+	
+	public void setInsertTime(Date insertTime) {
+		this.insertTime = insertTime;
+	}
+	
+	public Date getCompletionTime() {
+		return completionTime;
+	}
+	
+	public void setCompletionTime(Date completionTime) {
+		this.completionTime = completionTime;
+	}
+	
+	@Override
+	protected Serializable pkVal() {
+		return this.id;
+	}
+	
+	@Override
+	public String toString() {
+		return "DriverActivityHistory{" +
+				"id=" + id +
+				", day=" + day +
+				", driverId=" + driverId +
+				", type=" + type +
+				", activityId=" + activityId +
+				", carryOut=" + carryOut +
+				", money=" + money +
+				", insertTime=" + insertTime +
+				"}";
+	}
 }

--
Gitblit v1.7.1