From 391ea14026d1fe6417d4ce88ebedc6654b6519ad Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期二, 01 六月 2021 13:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/htwms' into htwms

---
 src/main/java/zy/cloud/wms/common/service/erp/entity/UploadStock.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/common/service/erp/entity/UploadStock.java b/src/main/java/zy/cloud/wms/common/service/erp/entity/UploadStock.java
index 54db2f6..1ef432a 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/entity/UploadStock.java
+++ b/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;
 
 }

--
Gitblit v1.9.1