Merge remote-tracking branch 'origin/dev_New' into dev_New

buhuazhen

6 天以前 3138e373e0c9c7eb5e0b0847ef16a7753c4fc170

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

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

    /**
     * 父节点ID