Merge branch 'feature/3.0' into feature/fangxinxing

longz

2026-07-02 c788ca1640f080f821cb1cbe07da741302d355ef

 DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Reassign.java

@@ -56,6 +56,36 @@
    @TableField("nowCarId")
    private Integer nowCarId;
    /**
     * 是否需要对方确认（1=不需要/同批次同时间，2=需要确认/其他司机）
     */
    @TableField("needConfirm")
    @ApiModelProperty("是否需要对方确认（1=不需要，2=需要确认）")
    private Integer needConfirm;
    /**
     * 确认状态（1=待确认，2=已同意，3=已拒绝，4=已超时）
     */
    @TableField("confirmStatus")
    @ApiModelProperty("确认状态（1=待确认，2=已同意，3=已拒绝，4=已超时）")
    private Integer confirmStatus;
    /**
     * 确认时间
     */
    @TableField("confirmTime")
    @ApiModelProperty("确认时间")
    private Date confirmTime;
    /**
     * 超时时间
     */
    @TableField("expireTime")
    @ApiModelProperty("超时时间")
    private Date expireTime;
    /**
     * 临时创建的lineShiftDriverId
     */
    @TableField("tempLineShiftDriverId")
    @ApiModelProperty("临时创建的lineShiftDriverId")
    private Integer tempLineShiftDriverId;
    /**
     * 改派支付的金额
     */
    @TableField("money")
@@ -236,6 +266,46 @@
        this.completeTime = completeTime;
    }

    public Integer getNeedConfirm() {
        return needConfirm;
    }

    public void setNeedConfirm(Integer needConfirm) {
        this.needConfirm = needConfirm;
    }

    public Integer getConfirmStatus() {
        return confirmStatus;
    }

    public void setConfirmStatus(Integer confirmStatus) {
        this.confirmStatus = confirmStatus;
    }

    public Date getConfirmTime() {
        return confirmTime;
    }

    public void setConfirmTime(Date confirmTime) {
        this.confirmTime = confirmTime;
    }

    public Date getExpireTime() {
        return expireTime;
    }

    public void setExpireTime(Date expireTime) {
        this.expireTime = expireTime;
    }

    public Integer getTempLineShiftDriverId() {
        return tempLineShiftDriverId;
    }

    public void setTempLineShiftDriverId(Integer tempLineShiftDriverId) {
        this.tempLineShiftDriverId = tempLineShiftDriverId;
    }

    @Override
    public String toString() {
        return "Reassign{" +