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

liyong

14 小时以前 168b0d2b658fffb2cf3fd1cf569a6c7b25c36a47

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

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


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