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

liyong

2 天以前 2329f548c36876a59a7808e8c96466e94e088350

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

@@ -22,6 +22,12 @@
    @Excel(name = "库存数量")
    private BigDecimal qualitity;

    @Excel(name = "预警数量")
    private BigDecimal warnNum;

    @Excel(name = "冻结数量")
    private BigDecimal lockedQuantity;

    @Excel(name = "备注")
    private String remark;
//