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

buhuazhen

6 天以前 706d0d62cc25829ec6948e2fd5d03e62acf29306

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