Merge remote-tracking branch 'origin/dev_长治_祥雨远见' into dev_长治_祥雨远见

gongchunyi

6 天以前 9f5813763a54f7fde8b472b0da305d635a624e8f

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