Merge remote-tracking branch 'origin/dev_New' into dev_新疆_大罗素马铃薯

云

9 天以前 e4c10a806ff29d18cdbdd182a5930316eae3fd83

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