From 23213c63022ee4dd7f4d8f678838865f01e9b2df Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期五, 19 一月 2024 11:06:48 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.189:29418/Jcdm041-Mes

---
 jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/domain/BsTechnologyRouteInfo.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/domain/BsTechnologyRouteInfo.java b/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/domain/BsTechnologyRouteInfo.java
index dcb3daf..736590c 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/domain/BsTechnologyRouteInfo.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/technologyRoute/domain/BsTechnologyRouteInfo.java
@@ -25,7 +25,12 @@
     /** 宸ヨ壓娴佺▼鍚嶇О */
     @Excel(name = "宸ヨ壓娴佺▼鍚嶇О")
     private String routeName;
+    @Excel(name = "浜х嚎缂栧彿")
+    private String lineCode;
 
+    /** 浜х嚎鍚嶇О */
+    @Excel(name = "浜х嚎鍚嶇О")
+    private String lineName;
     /** 浜у搧缂栫爜 */
     @Excel(name = "浜у搧缂栫爜")
     private String productCode;
@@ -74,6 +79,24 @@
     public Long getId() 
     {
         return id;
+    }
+    public void setLineCode(String lineCode)
+    {
+        this.lineCode = lineCode;
+    }
+
+    public String getLineCode()
+    {
+        return lineCode;
+    }
+    public void setLineName(String lineName)
+    {
+        this.lineName = lineName;
+    }
+
+    public String getLineName()
+    {
+        return lineName;
     }
     public void setRouteCode(String routeCode) 
     {
@@ -199,6 +222,8 @@
             .append("id", getId())
             .append("routeCode", getRouteCode())
             .append("routeName", getRouteName())
+                .append("lineCode", getLineCode())
+                .append("lineName", getLineName())
             .append("productCode", getProductCode())
             .append("productName", getProductName())
             .append("version", getVersion())

--
Gitblit v1.9.3