From 16cee07f274c039bf0dcb5da347859053b7c2586 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 05 八月 2025 09:28:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java
index 1ec7af7..a76621b 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSystemPrice.java
@@ -30,9 +30,10 @@
*/
private Integer type;
/**
- * 企业id
+ * 价格城市id
*/
- private Integer companyId;
+ @TableField("systemPriceCityId")
+ private Integer systemPriceCityId;
/**
* 服务车型id
*/
@@ -138,18 +139,6 @@
public void setType(Integer type) {
this.type = type;
- }
-
- public Integer getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Integer companyId) {
- this.companyId = companyId;
- }
-
- public Integer getServerCarModelId() {
- return serverCarModelId;
}
public void setServerCarModelId(Integer serverCarModelId) {
@@ -275,8 +264,19 @@
public void setIsOpenPrice(Integer isOpenPrice) {
this.isOpenPrice = isOpenPrice;
}
-
-
+
+ public Integer getSystemPriceCityId() {
+ return systemPriceCityId;
+ }
+
+ public void setSystemPriceCityId(Integer systemPriceCityId) {
+ this.systemPriceCityId = systemPriceCityId;
+ }
+
+ public Integer getServerCarModelId() {
+ return serverCarModelId;
+ }
+
@Override
protected Serializable pkVal() {
return this.id;
@@ -287,7 +287,6 @@
return "TSystemPrice{" +
"id=" + id +
", type=" + type +
- ", companyId=" + companyId +
", serverCarModelId=" + serverCarModelId +
", content='" + content + '\'' +
", fareTypeNote1='" + fareTypeNote1 + '\'' +
--
Gitblit v1.7.1