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

gongchunyi

3 天以前 c65009112d54e6851c9deb646d43bed6d602b99c

 src/main/java/com/ruoyi/production/pojo/ProcessRoute.java

@@ -40,5 +40,5 @@
    private String processRouteCode;

    @ApiModelProperty(value = "BOM的ID")
    private Long bomId;
    private Integer bomId;
}