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

gongchunyi

11 小时以前 f3cf05b74840f57f632af858ee27aab1d937cab8

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

@@ -19,6 +19,7 @@
    /**
     * 产品名称
     */
    //宁夏-中盛建材使用新的产品表关联product_material_sku
    private Long productModelId;

    /**
@@ -50,7 +51,10 @@
    /**
     * 关联BOMid
     */
    private Long bomId;
    private Integer bomId;


    /**
     * 父节点ID
     */
    private Long parentId;
}