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

zss

7 小时以前 f68d79d0ff6658795c19c2fd473fab9ff6f0640d

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

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

    /**