Merge branch 'master' of https://gitee.com/luxiaotao1123/wms-cloud

luxiaotao1123

2021-04-09 3c2720bc6434acc91f2b085e41083bec374e5a85

 src/main/java/zy/cloud/wms/common/service/erp/entity/UploadStock.java

@@ -23,6 +23,6 @@
    private Integer dataSize;

    // 记录数据集
    private List<UploadStockDtel> data;
    private List<UploadStockDtel> detail;

}