Merge remote-tracking branch 'origin/dev_New_pro' into dev_宁夏_英泽防锈

liyong

3 天以前 f57064d2fa563ee4cfeeccd715850ba8b8aa4f60

 src/main/java/com/ruoyi/quality/pojo/QualityInspect.java

@@ -96,9 +96,17 @@
    /**
     * 数量
     */
    @Excel(name = "数量")
    @Excel(name = "总数量")
    private BigDecimal quantity;

    @Excel(name = "合格数量")
    @TableField("qualified_quantity")
    private BigDecimal qualifiedQuantity;

    @Excel(name = "不合格数量")
    @TableField("unqualified_quantity")
    private BigDecimal unqualifiedQuantity;

    /**
     * 检测单位
     */