Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材

gongchunyi

3 天以前 f05fd2a067d751333f00a81dad095a7650900c95

 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;
//