Merge remote-tracking branch 'origin/master'

cl

2024-02-17 7ff5e9edadf446d0d033574a7b0ae802f5ac2233

 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())