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

王佳豪

2021-06-01 391ea14026d1fe6417d4ce88ebedc6654b6519ad

 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;

}