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

liyong

6 天以前 dee56ed8d52f1d8ee1f89b369561c49e9b3b7c2d

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

@@ -13,11 +13,13 @@
@Data
public class StockInventoryExportData {



    @Excel(name = "产品名称")
    private String model;
    private String productName;

    @Excel(name = "规格")
    private String productName;
    private String model;

    @Excel(name = "单位")
    private String unit;