Merge branch 'feature-task'

wlzboy

2025-10-26 2c86a8bd60deed0dd0e044bad6fb83f75d19a332

 ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleInfo.java

@@ -14,6 +14,10 @@
    /** 车辆ID */
    private Long vehicleId;

    /** 旧系统车辆ID(SQL Server CarID) */
    @Excel(name = "旧系统车辆ID")
    private Integer carId;

    /** 设备ID */
    @Excel(name = "设备ID")
    private String deviceId;
@@ -47,7 +51,7 @@
    private Long deptId;

    /** 归属部门名称 */
    @Excel(name = "归属部门名称")
    @Excel(name = "归属部门")
    private String deptName;

    public void setVehicleId(Long vehicleId) {
@@ -56,6 +60,14 @@

    public Long getVehicleId() {
        return vehicleId;
    }

    public void setCarId(Integer carId) {
        this.carId = carId;
    }

    public Integer getCarId() {
        return carId;
    }

    public void setDeviceId(String deviceId) {
@@ -134,6 +146,7 @@
    public String toString() {
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
                .append("vehicleId", getVehicleId())
                .append("carId", getCarId())
                .append("deviceId", getDeviceId())
                .append("vehicleNo", getVehicleNo())
                .append("vehicleType", getVehicleType())