From 73b750200f25df08aa64124da49e7461f9de6653 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 13 十二月 2024 15:09:49 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel
---
UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/dto/CharteredCarDto.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/dto/CharteredCarDto.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/dto/CharteredCarDto.java
index d413c77..ef85262 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/dto/CharteredCarDto.java
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/CharteredCar/dto/CharteredCarDto.java
@@ -1,6 +1,7 @@
package com.stylefeng.guns.modular.CharteredCar.dto;
import com.baomidou.mybatisplus.annotations.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -9,8 +10,8 @@
@Data
public class CharteredCarDto {
@ApiModelProperty("出行时间")
- private Date traveltime;
- @ApiModelProperty("出行时间")
+ private String traveltime;
+ @ApiModelProperty("用车时间")
private double carTime;
@ApiModelProperty("车型id")
private Integer serverCarModelId;
@@ -19,8 +20,15 @@
@ApiModelProperty("联系人电话")
private String contactPhone;
@ApiModelProperty("备注")
- private String remark;
-
+ private String newRemark;
private Integer userId;
+ private Double startLon;
+ private Double startLat;
+ private String startAddress;
+ private Double endLon;
+ private Double endLat;
+ private String endAddress;
+
+ private Integer serviceId;
}
--
Gitblit v1.7.1