Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel i...

无关风月

2024-10-11 48effdca685a209c19dd2a0ccd456470a895784b

 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;
    }