From 3af9c82375df6bd77ae78a5d900c409a895ecd18 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 14 十一月 2024 17:10:16 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into 2.0
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java | 64 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 18 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java
index 64bca7f..4466c13 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TServerCarmodel.java
@@ -35,7 +35,15 @@
/**
* 车型名称
*/
- private String name;
+ private String chineseName;
+ /**
+ * 车型名称
+ */
+ private String englishName;
+ /**
+ * 车型名称
+ */
+ private String frenchName;
/**
* 车型图片
*/
@@ -51,11 +59,12 @@
/**
* 是否勾选了专车 0否1是
*/
- private Integer isPrivateCar;
+// private Integer isPrivateCar;
/**
* 是否勾选了包裹 0否1是
*/
- private Integer isPackage;
+// private Integer isPackage;
+
/**
* 添加时间
*/
@@ -84,15 +93,31 @@
public void setType(Integer type) {
this.type = type;
}
-
- public String getName() {
- return name;
+
+ public String getChineseName() {
+ return chineseName;
}
-
- public void setName(String name) {
- this.name = name;
+
+ public void setChineseName(String chineseName) {
+ this.chineseName = chineseName;
}
-
+
+ public String getEnglishName() {
+ return englishName;
+ }
+
+ public void setEnglishName(String englishName) {
+ this.englishName = englishName;
+ }
+
+ public String getFrenchName() {
+ return frenchName;
+ }
+
+ public void setFrenchName(String frenchName) {
+ this.frenchName = frenchName;
+ }
+
public String getImg() {
return img;
}
@@ -121,16 +146,19 @@
protected Serializable pkVal() {
return this.id;
}
-
+
@Override
public String toString() {
return "TServerCarmodel{" +
- "id=" + id +
- ", type=" + type +
- ", name=" + name +
- ", img=" + img +
- ", state=" + state +
- ", insertTime=" + insertTime +
- "}";
+ "id=" + id +
+ ", type=" + type +
+ ", chineseName='" + chineseName + '\'' +
+ ", englishName='" + englishName + '\'' +
+ ", frenchName='" + frenchName + '\'' +
+ ", img='" + img + '\'' +
+ ", price='" + price + '\'' +
+ ", state=" + state +
+ ", insertTime=" + insertTime +
+ '}';
}
}
--
Gitblit v1.7.1