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

maven

3 天以前 2a9c3934bb093c978a54a1c3e220e6a120855e77

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

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

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

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