Merge remote-tracking branch 'origin/dev_New' into dev_New

zss

2 天以前 5c998c8f14dbf037c0a8e310e013fb4580f0c61d

 src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java

@@ -15,12 +15,17 @@
    @ApiModelProperty(value = "工艺路线名称")
    private String routeName;

    @ApiModelProperty(value = "产品名称")
    @ApiModelProperty(value = "生产炒机")
    private String speculativeTradingName;

    @ApiModelProperty(value = "产品名称")
    private String productName;

    @ApiModelProperty(value = "单位")
    private String unit;

    private Long productId;


    private List<ProcessRouteItem> processRouteItem;
    private String model;
}