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

liyong

21 小时以前 7558d3cb61282e41e27f85f56e829c6e6409f66d

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

@@ -13,4 +13,6 @@

    @ApiModelProperty("规格")
    private String model;

    private String bomNo;
}