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

gongchunyi

8 小时以前 f3cf05b74840f57f632af858ee27aab1d937cab8

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

@@ -38,6 +38,7 @@
    private String bomNo;

    @ApiModelProperty("产品规格id")
    //宁夏-中盛建材使用新的产品表关联product_material_sku
    private Long productModelId;

    @ApiModelProperty("备注")