Merge branch 'test_bak' into 'master'

罗元桥

2021-09-27 a5ebb9545a1fdc78f6c1c285ce4f6c7a37b9e749

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/convenient/ConvenientProductDTO.java

@@ -55,4 +55,12 @@

    @ApiModelProperty(value = "所属商家", hidden = true)
    private Long merchantId;

    public Boolean getOnShelf() {
        return onShelf.intValue() == 1;
    }

    public void setOnShelf(Boolean onShelf) {
        this.onShelf = onShelf ? 1 : 0;
    }
}