Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

gongchunyi

6 天以前 8c8d8769f5e23439f7d44c300eba763ee64b2352

 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;
}