Merge remote-tracking branch 'origin/master'

luqingyang

2023-10-31 ddaf74466d92dffb9ba8242a071f151f9a7e0e41

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

@@ -20,6 +20,10 @@
    protected boolean isset_id = false;

    // 属性列表
    private Integer warehouseType = null;
    @JsonIgnore
    protected boolean isset_warehouseType = false;

    private Long warehouseId = null;
    @JsonIgnore
    protected boolean isset_warehouseId = false;
@@ -105,6 +109,20 @@
    @JsonIgnore
    public boolean isEmptyId() {
        return this.id == 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() {
@@ -296,6 +314,7 @@
    public String toString() {
        return new StringBuilder()
                .append("id=").append(this.id)
                .append("warehouseType=").append(this.warehouseType)
                .append("warehouseId=").append(this.warehouseId)
                .append("warehouseName=").append(this.warehouseName)
                .append("costType=").append(this.costType)
@@ -326,6 +345,9 @@
            l_wh_goods.setId(this.getId());
        }
        // 普通属性
        if (this.isset_warehouseType) {
            l_wh_goods.setWarehouseType(this.getWarehouseType());
        }
        if (this.isset_warehouseId) {
            l_wh_goods.setWarehouseId(this.getWarehouseId());
        }