From 709a4a10be56952ead6340e4822fce41a66e47cd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 26 七月 2023 18:39:28 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/SuperSaveDriving into dev

---
 management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java |   96 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 96 insertions(+), 0 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java
index 07a9452..b70d2df 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TOrder.java
@@ -7,6 +7,7 @@
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 
@@ -55,6 +56,7 @@
     /**
      * 开始服务时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date startTime;
     /**
      * 起点地址
@@ -88,6 +90,30 @@
      * 下车时间
      */
     private Date getoffTime;
+    /**
+     * 上车地址
+     */
+    private String boardingAddress;
+    /**
+     * 上车经度
+     */
+    private String boardingLng;
+    /**
+     * 上车纬度
+     */
+    private String boardingLat;
+    /**
+     * 下车地址
+     */
+    private String debusAddress;
+    /**
+     * 下车经度
+     */
+    private String debusLng;
+    /**
+     * 下车纬度
+     */
+    private String debusLat;
     /**
      * 预估价
      */
@@ -189,6 +215,28 @@
 
     @ApiModelProperty(value = "是否已开票 1是 0否")
     private Integer isInvoice;
+
+    @ApiModelProperty(value = "用户手机号")
+    private String userPhone;
+
+    @ApiModelProperty(value = "用户姓名")
+    private String userName;
+
+    public String getUserPhone() {
+        return userPhone;
+    }
+
+    public void setUserPhone(String userPhone) {
+        this.userPhone = userPhone;
+    }
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
 
     public Integer getIsInvoice() {
         return isInvoice;
@@ -486,6 +534,54 @@
         this.estimatedPrice = estimatedPrice;
     }
 
+    public String getBoardingAddress() {
+        return boardingAddress;
+    }
+
+    public void setBoardingAddress(String boardingAddress) {
+        this.boardingAddress = boardingAddress;
+    }
+
+    public String getBoardingLng() {
+        return boardingLng;
+    }
+
+    public void setBoardingLng(String boardingLng) {
+        this.boardingLng = boardingLng;
+    }
+
+    public String getBoardingLat() {
+        return boardingLat;
+    }
+
+    public void setBoardingLat(String boardingLat) {
+        this.boardingLat = boardingLat;
+    }
+
+    public String getDebusAddress() {
+        return debusAddress;
+    }
+
+    public void setDebusAddress(String debusAddress) {
+        this.debusAddress = debusAddress;
+    }
+
+    public String getDebusLng() {
+        return debusLng;
+    }
+
+    public void setDebusLng(String debusLng) {
+        this.debusLng = debusLng;
+    }
+
+    public String getDebusLat() {
+        return debusLat;
+    }
+
+    public void setDebusLat(String debusLat) {
+        this.debusLat = debusLat;
+    }
+
     public BigDecimal getOrderMoney() {
         return orderMoney;
     }

--
Gitblit v1.7.1