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

zss

2 天以前 17d65c77c6fedf1b51afec166c5a9735c6e4d38e

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

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

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


}