Merge remote-tracking branch 'origin/master'

luqingyang

2023-10-31 ddaf74466d92dffb9ba8242a071f151f9a7e0e41

 consum-model-pojo/src/main/java/com/consum/model/po/LGoodsWhRecord.java

@@ -28,6 +28,10 @@
    @JsonIgnore
    protected boolean isset_whGoodsId = false;

    private Integer warehouseType = null;
    @JsonIgnore
    protected boolean isset_warehouseType = false;

    private Long warehouseId = null;
    @JsonIgnore
    protected boolean isset_warehouseId = false;
@@ -99,6 +103,20 @@
        return this.whGoodsId == null;
    }

    public Integer getWarehouseType() {
        return this.warehouseType;
    }

    public void setWarehouseType(Integer warehouseType) {
        this.warehouseType = warehouseType;
        this.isset_warehouseType = true;
    }

    @JsonIgnore
    public boolean isEmptyWarehouseType() {
        return this.warehouseType == null;
    }

    public Long getWarehouseId() {
        return this.warehouseId;
    }
@@ -136,6 +154,7 @@
                .append("id=").append(this.id)
                .append("warehouseFlowId=").append(this.warehouseFlowId)
                .append("whGoodsId=").append(this.whGoodsId)
                .append("warehouseType=").append(this.warehouseType)
                .append("warehouseId=").append(this.warehouseId)
                .append("dealTime=").append(this.dealTime)
                .toString();
@@ -161,6 +180,9 @@
        if (this.isset_whGoodsId) {
            l_goods_wh_record.setWhGoodsId(this.getWhGoodsId());
        }
        if (this.isset_warehouseType) {
            l_goods_wh_record.setWarehouseType(this.getWarehouseType());
        }
        if (this.isset_warehouseId) {
            l_goods_wh_record.setWarehouseId(this.getWarehouseId());
        }