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

lyfO_o

2021-10-21 ab570b8dd8e9fe5c154a3f34129639636078b2a6

 src/main/java/com/nanometer/smartlab/entity/dto/SysWarehouseContainerDto.java

@@ -1,6 +1,8 @@
package com.nanometer.smartlab.entity.dto;

public class SysWarehouseContainerDto {
import java.io.Serializable;

public class SysWarehouseContainerDto implements Serializable {

    private String id;
    private String type;