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

zss

2 天以前 7f642bd0b97e30ef91ac6d2809d7e4a77d00c7fe

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

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


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