Merge branch 'jtwy' into dev_New

zss

21 小时以前 be09cd5461ee9e2589ed833510ac6a2a52ded6f3

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

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

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

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