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

gongchunyi

7 天以前 61fef835f616f70ca35e1f046cdda82d6b68bfdc

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

@@ -52,5 +52,8 @@
     */
    private Long bomId;


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