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

liyong

21 小时以前 60806825951c111ac107dec87bd3acc5a7d6a707

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