Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印

buhuazhen

18 小时以前 e19b7b5d6b4a7658a7e172527017052a68b49f4d

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