From 5393e1b43f7148adc93dd5a29f7b6fd4a054eec6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 05 六月 2025 16:13:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/OrderController.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/OrderController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/OrderController.java
index 435fce1..2e2b60b 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/OrderController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/OrderController.java
@@ -152,6 +152,7 @@
 			order.setDrivingLicenseNumber(driver.getDrivingLicenseNumber());
 		}
 		order.setVehicleNumber(car.getVehicleNumber());
+		order.setDeviceId(car.getDeviceId());
 		order.setEnterpriseName(enterprise.getName());
 		return R.ok(order);
 	}

--
Gitblit v1.7.1