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

maven

16 小时以前 df2ff592a5b9037a747032f3351836e0c61fb4f9

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

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

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

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