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

buhuazhen

6 天以前 c449e0d7e5e537cd8dfb5928572db31d0310bc0e

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

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

    @Excel(name = "批号")
    private String batchNo;
    @Excel(name = "库存数量")
    private BigDecimal qualitity;