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

gdg

2021-02-02 aab1d1e20e7b4b72a9bd98c5d26fdfb087b4c57b

 src/main/java/com/nanometer/smartlab/entity/OpeWarehouseReserve.java

@@ -32,6 +32,7 @@
    private String orderCode;
    //新增 货柜id
    private String containerId;
    private String userId;


    /**
@@ -199,4 +200,12 @@
    public void setContainerId(String containerId) {
        this.containerId = containerId;
    }

    public String getUserId() {
        return userId;
    }

    public void setUserId(String userId) {
        this.userId = userId;
    }
}