Merge branch 'test_screen' into 'master'

罗元桥

2021-06-16 2bff00bae9369d70d29acde8fea1fd8192ada033

 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;

}