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
---
DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/LineWarpper.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/LineWarpper.java b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/LineWarpper.java
index cac8d95..7752d53 100644
--- a/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/LineWarpper.java
+++ b/DriverNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/warpper/LineWarpper.java
@@ -2,12 +2,14 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ApiModel("线路")
+@Data
public class LineWarpper {
@ApiModelProperty("线路id")
private Integer id;
@@ -17,6 +19,12 @@
private String startAddress;
@ApiModelProperty("终点")
private String endAddress;
+ private String startSiteName;
+ private String endSiteName;
+ private String startCityName;
+ private String endCityName;
+ private String startCityId;
+ private String endCityId;
public Integer getId() {
return id;
@@ -68,6 +76,12 @@
lineWarpper.setName(null != map.get("name") ? map.get("name").toString() : "");
lineWarpper.setStartAddress(null != map.get("startAddress") ? map.get("startAddress").toString() : "");
lineWarpper.setEndAddress(null != map.get("endAddress") ? map.get("endAddress").toString() : "");
+ lineWarpper.setStartSiteName(null != map.get("startSiteName") ? map.get("startSiteName").toString() : "");
+ lineWarpper.setEndSiteName(null != map.get("endSiteName") ? map.get("endSiteName").toString() : "");
+ lineWarpper.setStartCityName(null != map.get("startCityName") ? map.get("startCityName").toString() : "");
+ lineWarpper.setEndCityName(null != map.get("endCityName") ? map.get("endCityName").toString() : "");
+ lineWarpper.setStartCityId(null != map.get("startCityId") ? map.get("startCityId").toString() : "");
+ lineWarpper.setEndCityId(null != map.get("endCityId") ? map.get("endCityId").toString() : "");
}
return lineWarpper;
}
--
Gitblit v1.7.1