From 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa Mon Sep 17 00:00:00 2001
From: 李宇 <986321569@qq.com>
Date: 星期五, 12 十一月 2021 12:49:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/nanometer/smartlab/entity/dto/SysWarehouseDto.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/nanometer/smartlab/entity/dto/SysWarehouseDto.java b/src/main/java/com/nanometer/smartlab/entity/dto/SysWarehouseDto.java
index 7881e5a..978ac32 100644
--- a/src/main/java/com/nanometer/smartlab/entity/dto/SysWarehouseDto.java
+++ b/src/main/java/com/nanometer/smartlab/entity/dto/SysWarehouseDto.java
@@ -13,7 +13,7 @@
private String barCode;
private String location1;
private String location2;
- private List<SysWarehouseContainerDto> sysWarehouseContainerDto;
+ private List<SysWarehouseContainerDto> sysWarehouseContainer;
public String getId() {
return id;
@@ -71,11 +71,11 @@
this.location2 = location2;
}
- public List<SysWarehouseContainerDto> getSysWarehouseContainerDto() {
- return sysWarehouseContainerDto;
+ public List<SysWarehouseContainerDto> getSysWarehouseContainer() {
+ return sysWarehouseContainer;
}
- public void setSysWarehouseContainerDto(List<SysWarehouseContainerDto> sysWarehouseContainerDto) {
- this.sysWarehouseContainerDto = sysWarehouseContainerDto;
+ public void setSysWarehouseContainer(List<SysWarehouseContainerDto> sysWarehouseContainer) {
+ this.sysWarehouseContainer = sysWarehouseContainer;
}
}
--
Gitblit v1.9.2