Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

gongchunyi

14 小时以前 f3cf05b74840f57f632af858ee27aab1d937cab8

 src/main/java/com/ruoyi/production/pojo/ProcessRoute.java

@@ -18,7 +18,7 @@
    private Long id;

    @ApiModelProperty(value = "产品ID")
    //product_model
    //宁夏-中盛建材使用新的产品表关联product_material_sku
    private Long productModelId;

    @ApiModelProperty(value = "描述")
@@ -40,5 +40,5 @@
    private String processRouteCode;

    @ApiModelProperty(value = "BOM的ID")
    private Long bomId;
    private Integer bomId;
}