From 01d8de48c76467ff3b99b204e66d3ef86506fa52 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 25 七月 2024 18:23:40 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java
index cbcadac..57246c2 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityOnline.java
@@ -5,6 +5,8 @@
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -16,6 +18,7 @@
  * @since 2020-06-17
  */
 @TableName("t_driver_activity_online")
+@Data
 public class DriverActivityOnline extends Model<DriverActivityOnline> {
 
     private static final long serialVersionUID = 1L;
@@ -37,11 +40,13 @@
     /**
      * 在线小时
      */
-    private Integer online;
+    private Double online;
     /**
      * 奖励金额
      */
     private Double money;
+    // 自动下班时间
+    private Double offlineTime;
     /**
      * 有效期开始时间
      */
@@ -88,11 +93,11 @@
         this.type = type;
     }
 
-    public Integer getOnline() {
+    public Double getOnline() {
         return online;
     }
 
-    public void setOnline(Integer online) {
+    public void setOnline(Double online) {
         this.online = online;
     }
 

--
Gitblit v1.7.1