From 729a5a0592cac7750e8b476c5fcb25bfc3ff8d25 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期日, 27 七月 2025 09:06:31 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QianYunTong

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TbShowModular.java |  154 ++++++++++++++++++++++++++++-----------------------
 1 files changed, 84 insertions(+), 70 deletions(-)

diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TbShowModular.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TbShowModular.java
index 2c3c127..1600f54 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TbShowModular.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/TbShowModular.java
@@ -1,9 +1,10 @@
 package com.stylefeng.guns.modular.system.model;
 
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
@@ -18,72 +19,85 @@
  */
 @TableName("tb_show_modular")
 public class TbShowModular extends Model<TbShowModular> {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-    /**
-     * 类型(1=招募,2=租车,3=买车,4=出租个人车辆,5=卖车,6=商家中心,7=打车卡)
-     */
-    @ApiModelProperty("类型(1=招募,2=租车,3=买车,4=出租个人车辆,5=卖车,6=商家中心,7=打车卡)")
-    private Integer type;
-    /**
-     * 司机是否显示(1=是,2=否)
-     */
-    @ApiModelProperty("司机是否显示(1=是,2=否)")
-    private Integer driverShow;
-    /**
-     * 用户是否显示(1=是,2=否)
-     */
-    @ApiModelProperty("用户是否显示(1=是,2=否)")
-    private Integer userShow;
-
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public Integer getDriverShow() {
-        return driverShow;
-    }
-
-    public void setDriverShow(Integer driverShow) {
-        this.driverShow = driverShow;
-    }
-
-    public Integer getUserShow() {
-        return userShow;
-    }
-
-    public void setUserShow(Integer userShow) {
-        this.userShow = userShow;
-    }
-
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
-    }
-
-    @Override
-    public String toString() {
-        return "TbShowModular{" +
-        "id=" + id +
-        ", type=" + type +
-        ", driverShow=" + driverShow +
-        ", userShow=" + userShow +
-        "}";
-    }
+	
+	private static final long serialVersionUID = 1L;
+	
+	@TableId(value = "id", type = IdType.AUTO)
+	private Integer id;
+	/**
+	 * 类型(1=招募,2=租车,3=买车,4=出租个人车辆,5=卖车,6=商家中心,7=打车卡)
+	 */
+	@ApiModelProperty("类型(1=招募,2=租车,3=买车,4=出租个人车辆,5=卖车,6=商家中心,7=打车卡)")
+	private Integer type;
+	/**
+	 * 司机是否显示(1=是,2=否)
+	 */
+	@ApiModelProperty("司机是否显示(1=是,2=否)")
+	private Integer driverShow;
+	/**
+	 * 用户是否显示(1=是,2=否)
+	 */
+	@ApiModelProperty("用户是否显示(1=是,2=否)")
+	private Integer userShow;
+	/**
+	 * 开通城市id
+	 */
+	@TableField("openCityId")
+	private Integer openCityId;
+	
+	
+	public Integer getId() {
+		return id;
+	}
+	
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	
+	public Integer getType() {
+		return type;
+	}
+	
+	public void setType(Integer type) {
+		this.type = type;
+	}
+	
+	public Integer getDriverShow() {
+		return driverShow;
+	}
+	
+	public void setDriverShow(Integer driverShow) {
+		this.driverShow = driverShow;
+	}
+	
+	public Integer getUserShow() {
+		return userShow;
+	}
+	
+	public void setUserShow(Integer userShow) {
+		this.userShow = userShow;
+	}
+	
+	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 "TbShowModular{" +
+				"id=" + id +
+				", type=" + type +
+				", driverShow=" + driverShow +
+				", userShow=" + userShow +
+				"}";
+	}
 }

--
Gitblit v1.7.1