From 57909bfeb70e80689cfe515198e3a30ad3868bb8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 07 八月 2024 09:35:28 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0

---
 UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityHistory.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityHistory.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityHistory.java
index bc7c121..2a14440 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityHistory.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivityHistory.java
@@ -34,6 +34,11 @@
     @TableField("type")
     private Integer type;
     /**
+     * 司机活动id
+     */
+    @TableField("driverActivityId")
+    private Integer driverActivityId;
+    /**
      * 活动id
      */
     @TableField("activityId")
@@ -85,7 +90,15 @@
     public void setType(Integer type) {
         this.type = type;
     }
-
+    
+    public Integer getDriverActivityId() {
+        return driverActivityId;
+    }
+    
+    public void setDriverActivityId(Integer driverActivityId) {
+        this.driverActivityId = driverActivityId;
+    }
+    
     public Integer getActivityId() {
         return activityId;
     }

--
Gitblit v1.7.1