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 | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 2eb1b11..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,10 @@
/** 杞﹁締ID */
private Long vehicleId;
+ /** 鏃х郴缁熻溅杈咺D(SQL Server CarID) */
+ @Excel(name = "鏃х郴缁熻溅杈咺D")
+ 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())
--
Gitblit v1.9.1