From 7e7f901b2172281dc294dfbc67e6ad00625f09f4 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 04 三月 2024 10:11:21 +0800
Subject: [PATCH] 合并代码

---
 cloud-server-management/src/main/java/com/dsh/course/model/dto/DriverActivityHistory.java |   62 +++++++++++++++++++++++++++++++
 1 files changed, 62 insertions(+), 0 deletions(-)

diff --git a/cloud-server-management/src/main/java/com/dsh/course/model/dto/DriverActivityHistory.java b/cloud-server-management/src/main/java/com/dsh/course/model/dto/DriverActivityHistory.java
new file mode 100644
index 0000000..addd3ca
--- /dev/null
+++ b/cloud-server-management/src/main/java/com/dsh/course/model/dto/DriverActivityHistory.java
@@ -0,0 +1,62 @@
+//package com.dsh.app.model.dto;
+//
+//import com.baomidou.mybatisplus.annotation.IdType;
+//import com.baomidou.mybatisplus.annotation.TableField;
+//import com.baomidou.mybatisplus.annotation.TableId;
+//import com.baomidou.mybatisplus.annotation.TableName;
+//import lombok.Data;
+//
+//import java.util.Date;
+//
+///**
+// * 司机每天活动数量
+// */
+//@Data
+//@TableName("t_driver_activity_history")
+//public class DriverActivityHistory {
+//    /**
+//     * 主键
+//     */
+//    @TableId(value = "id", type = IdType.AUTO)
+//    @TableField("id")
+//    private Integer id;
+//    /**
+//     * 活动日期
+//     */
+//    @TableField("day")
+//    private Date day;
+//    /**
+//     * 司机id
+//     */
+//    @TableField("driverId")
+//    private Integer driverId;
+//    /**
+//     * 活动类型(1=邀请司机注册,2=邀请用户注册,3=累计在线,4=订单量)
+//     */
+//    @TableField("type")
+//    private Integer type;
+//    /**
+//     * 活动id
+//     */
+//    @TableField("activityId")
+//    private Integer activityId;
+//    /**
+//     * 是否完成(1=否,2=完成)
+//     */
+//    @TableField("carryOut")
+//    private Integer carryOut;
+//    /**
+//     * 奖励金额
+//     */
+//    @TableField("money")
+//    private Double money;
+//    //领取时间
+//    @TableField("collectionTime")
+//    private Date collectionTime;
+//    /**
+//     * 添加时间
+//     */
+//    @TableField("insertTime")
+//    private Date insertTime;
+//
+//}

--
Gitblit v1.7.1