From 8399270e3f12301ddf143c87bec9ca1be7b54ff0 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 15 八月 2025 11:05:18 +0800
Subject: [PATCH] 合并代码

---
 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java |  173 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 95 insertions(+), 78 deletions(-)

diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java
index 9caa26a..e6f191a 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TSysReformist.java
@@ -1,10 +1,14 @@
 package com.stylefeng.guns.modular.system.model;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.enums.IdType;
+
 import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableName;
+
 import java.io.Serializable;
 
 /**
@@ -17,82 +21,95 @@
  */
 @TableName("t_sys_reformist")
 public class TSysReformist extends Model<TSysReformist> {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 主键id
-     */
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-    /**
-     * 企业id
-     */
-    private Integer companyId;
-    /**
-     * 金额
-     */
-    private BigDecimal money;
-    /**
-     * 快车改派 1=否 2=是
-     */
-    private Integer isSpecialCar;
-    /**
-     * 出租车改派  1=否 2=是
-     */
-    private Integer isTaxiCar;
-
-    public Integer getIsSpecialCar() {
-        return isSpecialCar;
-    }
-
-    public void setIsSpecialCar(Integer isSpecialCar) {
-        this.isSpecialCar = isSpecialCar;
-    }
-
-    public Integer getIsTaxiCar() {
-        return isTaxiCar;
-    }
-
-    public void setIsTaxiCar(Integer isTaxiCar) {
-        this.isTaxiCar = isTaxiCar;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getCompanyId() {
-        return companyId;
-    }
-
-    public void setCompanyId(Integer companyId) {
-        this.companyId = companyId;
-    }
-
-    public BigDecimal getMoney() {
-        return money;
-    }
-
-    public void setMoney(BigDecimal money) {
-        this.money = money;
-    }
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-    @Override
-    public String toString() {
-        return "TSysReformist{" +
-        "id=" + id +
-        ", companyId=" + companyId +
-        ", money=" + money +
-        "}";
-    }
+	
+	private static final long serialVersionUID = 1L;
+	
+	/**
+	 * 主键id
+	 */
+	@TableId(value = "id", type = IdType.AUTO)
+	private Integer id;
+	/**
+	 * 企业id
+	 */
+	private Integer companyId;
+	/**
+	 * 开通城市id
+	 */
+	@TableField("openCityId")
+	private Integer openCityId;
+	/**
+	 * 金额
+	 */
+	private BigDecimal money;
+	/**
+	 * 快车改派 1=否 2=是
+	 */
+	private Integer isSpecialCar;
+	/**
+	 * 出租车改派  1=否 2=是
+	 */
+	private Integer isTaxiCar;
+	
+	public Integer getIsSpecialCar() {
+		return isSpecialCar;
+	}
+	
+	public void setIsSpecialCar(Integer isSpecialCar) {
+		this.isSpecialCar = isSpecialCar;
+	}
+	
+	public Integer getIsTaxiCar() {
+		return isTaxiCar;
+	}
+	
+	public void setIsTaxiCar(Integer isTaxiCar) {
+		this.isTaxiCar = isTaxiCar;
+	}
+	
+	public Integer getId() {
+		return id;
+	}
+	
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	
+	public Integer getCompanyId() {
+		return companyId;
+	}
+	
+	public void setCompanyId(Integer companyId) {
+		this.companyId = companyId;
+	}
+	
+	public BigDecimal getMoney() {
+		return money;
+	}
+	
+	public void setMoney(BigDecimal money) {
+		this.money = money;
+	}
+	
+	public Integer getOpenCityId() {
+		return openCityId;
+	}
+	
+	public void setOpenCityId(Integer openCityId) {
+		this.openCityId = openCityId;
+	}
+	
+	@Override
+	protected Serializable pkVal() {
+		return this.id;
+	}
+	
+	@Override
+	public String toString() {
+		return "TSysReformist{" +
+				"id=" + id +
+				", companyId=" + companyId +
+				", money=" + money +
+				"}";
+	}
 }

--
Gitblit v1.7.1