From 4109495b9c51a4bbd8b0a7c3c69093909d2e33e1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 07 四月 2025 18:55:05 +0800
Subject: [PATCH] 修改接口bug
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/Order.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/Order.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/Order.java
index 05c95d5..51214ef 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/Order.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/Order.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.ruoyi.common.core.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -30,6 +31,7 @@
*/
@TableField("code")
@ApiModelProperty(value = "订单编号")
+ @Excel(name = "订单编号", width = 30)
private String code;
/**
* 车辆id
@@ -40,10 +42,12 @@
@TableField(exist = false)
@ApiModelProperty(value = "车牌号")
+ @Excel(name = "车牌号", width = 30)
private String vehicleNumber;
@TableField(exist = false)
@ApiModelProperty(value = "车牌颜色")
+ @Excel(name = "车牌颜色", width = 30)
private String licensePlateColor;
/**
* 驾驶员id
@@ -53,8 +57,8 @@
private Integer driverId;
@TableField(exist = false)
- @ApiModelProperty(value = "司机姓名")
- private String driverName;
+ @ApiModelProperty(value = "驾驶证编号")
+ private String drivingLicenseNumber;
/**
* 企业id
*/
@@ -64,6 +68,7 @@
@TableField(exist = false)
@ApiModelProperty(value = "企业名称")
+ @Excel(name = "车辆所属公司", width = 30)
private String enterpriseName;
/**
* 下单地
@@ -72,23 +77,42 @@
@ApiModelProperty(value = "下单地")
private String orderPlace;
/**
+ * 发起地区划
+ */
+ @TableField("order_place_code")
+ @ApiModelProperty(value = "发起地区划")
+ private String orderPlaceCode;
+ /**
* 上车点
*/
@TableField("boarding_point")
@ApiModelProperty(value = "上车点")
+ @Excel(name = "上车地点", width = 30)
private String boardingPoint;
/**
* 下车点
*/
@TableField("drop_off_point")
@ApiModelProperty(value = "下车点")
+ @Excel(name = "下车地点", width = 30)
private String dropOffPoint;
/**
* 载客里程
*/
@TableField("passenger_mileage")
@ApiModelProperty(value = "载客里程")
+ @Excel(name = "载客里程", width = 30)
private String passengerMileage;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "司机姓名")
+ @Excel(name = "驾驶员名称", width = 30)
+ private String driverName;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "司机电话")
+ @Excel(name = "驾驶员电话", width = 30)
+ private String driverPhone;
/**
* 订单时间
*/
@@ -100,12 +124,14 @@
*/
@TableField("order_delivery_time")
@ApiModelProperty(value = "派单时间")
+ @Excel(name = "派单时间", width = 30)
private String orderDeliveryTime;
/**
* 订单金额
*/
@TableField("order_amount")
@ApiModelProperty(value = "订单金额")
+ @Excel(name = "订单金额", width = 30)
private String orderAmount;
/**
* 支付金额
--
Gitblit v1.7.1