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

101captain

2022-02-25 caefe9a9cc486247f831e46356b0b03ca450fdf9

 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;

}