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

yaowanxin

21 小时以前 dcf2c669cac48202ceea2d6917dff89b9a84cb95

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

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

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

    private String bomNo;
}