Merge branch 'dev_New' into pcdz

zss

2026-02-06 7df528176008256c3b177526274f89d391c61526

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