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

gdg

2021-01-18 3ec412f3cdc8b114cf629e866a7b7b80687a3442

 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;