Merge remote-tracking branch 'origin/master'

李宇

2021-11-12 43ee95fbdcb6fe0a9d548d0935c23c232d5ffeaa

 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;
    }
}