Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

lidongdong

2022-12-06 2a212f983f35e1c569dfec3a172fb5f0c9f85fac

 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;
    }
}