From 8beaf701a900ddd5a0a482f425080635ff55166d Mon Sep 17 00:00:00 2001
From: gdg <764716047@qq.com>
Date: 星期一, 01 二月 2021 10:16:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/nanometer/smartlab/entity/dto/SysWarehouseDto.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 4895a81..978ac32 100644
--- a/src/main/java/com/nanometer/smartlab/entity/dto/SysWarehouseDto.java
+++ b/src/main/java/com/nanometer/smartlab/entity/dto/SysWarehouseDto.java
@@ -2,8 +2,9 @@
import com.nanometer.smartlab.entity.SysWarehouseContainer;
+import java.io.Serializable;
import java.util.*;
-public class SysWarehouseDto {
+public class SysWarehouseDto implements Serializable {
private String id;
private String type;
@@ -12,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;
@@ -70,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