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

gdg

2021-02-02 529173267b4e7b4b296e92a8c8705e0da5180c89

 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;