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

gdg

2021-01-26 f5ccc7e9ca548c6bddf51ebe8e943fc09a3b2ff4

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

@@ -30,8 +30,14 @@
    private String endReagentCode2;
    private String applyCode;
    private String orderCode;
    //新增 货柜id
    private String containerId;


    /**
     * 补贴条码的暂存领用数量
     */
    public Integer useNum;
    public String getWarehouseId() {
        return warehouseId;
    }
@@ -177,4 +183,20 @@
    public void setOrderCode(String orderCode) {
        this.orderCode = orderCode;
    }

    public Integer getUseNum() {
        return useNum;
    }

    public void setUseNum(Integer useNum) {
        this.useNum = useNum;
    }

    public String getContainerId() {
        return containerId;
    }

    public void setContainerId(String containerId) {
        this.containerId = containerId;
    }
}