Merge remote-tracking branch 'origin/2.0' into 2.0

zhibing.pu

2024-05-27 f9b9131367d9ba6fe852130b12083c0f5ea68bbb

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/DriverActivity.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;

/**
@@ -15,6 +17,7 @@
 * @author stylefeng
 * @since 2020-06-17
 */
@Data
@TableName("t_driver_activity")
public class DriverActivity extends Model<DriverActivity> {

@@ -52,6 +55,7 @@
    private Date endTime;

    private Integer companyType;
    private String offline;

    public Integer getCompanyType() {
        return companyType;