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

云

昨天 8c0d4b8f762b1e1535379c604fdc8e2530dc6c8a

 src/main/java/com/ruoyi/stock/execl/StockInventoryExportData.java

@@ -19,6 +19,10 @@
    @Excel(name = "单位")
    private String unit;

    @Excel(name = "批号")
    private String batchNo;


    @Excel(name = "合格库存数量")
    private BigDecimal qualifiedQuantity;