Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ

101captain

2021-12-29 c0116d3fa128713d8466dbdf952fb61a64adc0b9

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ComShopHiddenConfVO.java

@@ -10,7 +10,7 @@

    @ApiModelProperty(value = "id")
    private Long id;
    @ApiModelProperty(value = "是否隐藏 0 否  1是")
    @ApiModelProperty(value = "是否隐藏所有商家 0 否  1是")
    private String hidden;

}