From 1e630a0e74dab5ae9e2704de890bbb16b951ec99 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期五, 23 八月 2024 15:46:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0

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

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivity.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivity.java
index 17d8c7e..970a9b4 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivity.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivity.java
@@ -55,7 +55,6 @@
     private Date endTime;
 
     private Integer companyType;
-    private String offline;
 
     public Integer getCompanyType() {
         return companyType;

--
Gitblit v1.7.1