From 2c86a8bd60deed0dd0e044bad6fb83f75d19a332 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 26 十月 2025 15:05:50 +0800
Subject: [PATCH] Merge branch 'feature-task'
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleInfo.java | 65 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleInfo.java
index 359b3c1..506de81 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleInfo.java
@@ -14,6 +14,14 @@
/** 杞﹁締ID */
private Long vehicleId;
+ /** 鏃х郴缁熻溅杈咺D(SQL Server CarID) */
+ @Excel(name = "鏃х郴缁熻溅杈咺D")
+ private Integer carId;
+
+ /** 璁惧ID */
+ @Excel(name = "璁惧ID")
+ private String deviceId;
+
/** 杞︾墝鍙� */
@Excel(name = "杞︾墝鍙�")
private String vehicleNo;
@@ -34,12 +42,40 @@
@Excel(name = "鐘舵��", readConverterExp = "0=姝ｅ父,1=鍋滅敤")
private String status;
+ /** 骞冲彴鏍囪瘑 */
+ @Excel(name = "骞冲彴鏍囪瘑")
+ private String platformCode;
+
+ /** 褰掑睘閮ㄩ棬ID */
+ @Excel(name = "褰掑睘閮ㄩ棬ID")
+ private Long deptId;
+
+ /** 褰掑睘閮ㄩ棬鍚嶇О */
+ @Excel(name = "褰掑睘閮ㄩ棬")
+ private String deptName;
+
public void setVehicleId(Long vehicleId) {
this.vehicleId = vehicleId;
}
public Long getVehicleId() {
return vehicleId;
+ }
+
+ public void setCarId(Integer carId) {
+ this.carId = carId;
+ }
+
+ public Integer getCarId() {
+ return carId;
+ }
+
+ public void setDeviceId(String deviceId) {
+ this.deviceId = deviceId;
+ }
+
+ public String getDeviceId() {
+ return deviceId;
}
public void setVehicleNo(String vehicleNo) {
@@ -82,15 +118,44 @@
return status;
}
+ public String getPlatformCode() {
+ return platformCode;
+ }
+
+ public void setPlatformCode(String platformCode) {
+ this.platformCode = platformCode;
+ }
+
+ public Long getDeptId() {
+ return deptId;
+ }
+
+ public void setDeptId(Long deptId) {
+ this.deptId = deptId;
+ }
+
+ public String getDeptName() {
+ return deptName;
+ }
+
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
+
@Override
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())
.append("vehicleBrand", getVehicleBrand())
.append("vehicleModel", getVehicleModel())
.append("status", getStatus())
+ .append("platformCode", getPlatformCode())
+ .append("deptId", getDeptId())
+ .append("deptName", getDeptName())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
--
Gitblit v1.9.1