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

maven

昨天 4ed6929b3c8e8d12b64dade132ffd8023cbb73b3

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

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

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

    private String bomNo;
}