Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-09-27 5c70b1f8fd59e1d35014c08d63a28f58b7aa9249

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