Merge branch 'master' of http://116.198.39.83:7111/r/xxjProject/low-consum-...

zhy

2023-10-25 2f0ade35ec9107f94c153057b207e4f21e9a29b0

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

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

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

    private String warehouseCode = null;
    @JsonIgnore
    protected boolean isset_warehouseCode = false;
@@ -93,6 +97,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 String getWarehouseCode() {
@@ -242,6 +260,7 @@
    public String toString() {
        return new StringBuilder()
                .append("id=").append(this.id)
                .append("warehouseType=").append(this.warehouseType)
                .append("warehouseCode=").append(this.warehouseCode)
                .append("warehouseName=").append(this.warehouseName)
                .append("adress=").append(this.adress)
@@ -269,6 +288,9 @@
            base_warehouse.setId(this.getId());
        }
        // 普通属性
        if (this.isset_warehouseType) {
            base_warehouse.setWarehouseType(this.getWarehouseType());
        }
        if (this.isset_warehouseCode) {
            base_warehouse.setWarehouseCode(this.getWarehouseCode());
        }