Merge branch 'zhaozhengjie1104' into test

101captain

2021-11-09 acbf62b66a8dfeddbe1918b32c4e11697b4a5788

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/convenient/ConvenientProductVO.java

@@ -50,4 +50,8 @@

    @ApiModelProperty("浏览量")
    private Integer viewNum;

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