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

liyong

4 天以前 f5624a59380db70633eebe3612e2d3c703012b41

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

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

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

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