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

gongchunyi

8 天以前 a10faaa8d2a80f0302c35a5d73dcb7b3fb069133

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

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

    /**
     * 父节点ID