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

buhuazhen

2026-03-06 b7eb6e87b4d88e5a419b64e3e3d0e5dc1be0f48f

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