Merge branch 'test' into 'test_bak'

罗元桥

2021-09-28 2ab17a1a9207b64b871d307279eaba879b2e69c8

 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;

}