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

yaowanxin

20 小时以前 6f888b234148d1a4dbd1e6c28a8d9ed85ebfda09

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

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

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

    private String bomNo;
}