Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子

yuan

15 小时以前 fb40c4dfec5954c321f38bb86e9d07eb87b97bfd

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