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

gdg

2021-01-26 78ea95ba31e63279b46d47c5c9ca983f3e0c8d47

 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;