From 5470d21a35286abe41fafc25a7deaabefd7c55da Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 28 五月 2024 14:30:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/LineSite.java |   83 +++++++++++------------------------------
 1 files changed, 22 insertions(+), 61 deletions(-)

diff --git a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/LineSite.java b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/LineSite.java
index 003e2b7..335c508 100644
--- a/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/LineSite.java
+++ b/UserNTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/model/LineSite.java
@@ -6,49 +6,35 @@
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * 线路排班
  */
-@TableName("t_line_shift")
+@TableName("t_line_site")
 public class LineSite {
+
+    private static final long serialVersionUID = 1L;
+
     /**
      * 主键
      */
     @TableId(value = "id", type = IdType.AUTO)
-    @TableField("id")
     private Integer id;
     /**
      * 线路id
      */
-    @TableField("lineId")
     private Integer lineId;
     /**
-     * 开始时间段
+     * 站点id
      */
-    @TableField("startTime")
-    private String startTime;
+    private Integer siteId;
     /**
-     * 结束时间段
+     * 类型(1=起点,2=终点)
      */
-    @TableField("endTime")
-    private String endTime;
-    /**
-     * 车次数
-     */
-    @TableField("carNum")
-    private Integer carNum;
-    /**
-     * 状态(1=正常,2=冻结,3=删除)
-     */
-    @TableField("state")
-    private Integer state;
-    /**
-     * 添加时间
-     */
-    @TableField("insertTime")
-    private Date insertTime;
+    private Integer type;
+
 
     public Integer getId() {
         return id;
@@ -66,56 +52,31 @@
         this.lineId = lineId;
     }
 
-    public String getStartTime() {
-        return startTime;
+    public Integer getSiteId() {
+        return siteId;
     }
 
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
+    public void setSiteId(Integer siteId) {
+        this.siteId = siteId;
     }
 
-    public String getEndTime() {
-        return endTime;
+    public Integer getType() {
+        return type;
     }
 
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
+    public void setType(Integer type) {
+        this.type = type;
     }
 
-    public Integer getCarNum() {
-        return carNum;
-    }
 
-    public void setCarNum(Integer carNum) {
-        this.carNum = carNum;
-    }
-
-    public Integer getState() {
-        return state;
-    }
-
-    public void setState(Integer state) {
-        this.state = state;
-    }
-
-    public Date getInsertTime() {
-        return insertTime;
-    }
-
-    public void setInsertTime(Date insertTime) {
-        this.insertTime = insertTime;
-    }
 
     @Override
     public String toString() {
-        return "LineSite{" +
+        return "TLineSite{" +
                 "id=" + id +
                 ", lineId=" + lineId +
-                ", startTime='" + startTime + '\'' +
-                ", endTime='" + endTime + '\'' +
-                ", carNum=" + carNum +
-                ", state=" + state +
-                ", insertTime=" + insertTime +
-                '}';
+                ", siteId=" + siteId +
+                ", type=" + type +
+                "}";
     }
 }

--
Gitblit v1.7.1