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

maven

2 天以前 55c4143362c7df1ece4523597e26947d35e21bda

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

@@ -40,6 +40,11 @@
    private String unit;

    /**
     * 父级id
     */
    private Long parentId;

    /**
     * 盘数量
     */
    private BigDecimal diskQuantity;