Merge branch 'test' into 'master'

罗元桥

2021-08-31 b9b493e3da134f8e4eb36e5b831063fd27fef417

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/ComShopSysConfDTO.java

@@ -16,6 +16,6 @@
public class ComShopSysConfDTO {
    @ApiModelProperty(value = "id", required = true)
    private Long id;
    @ApiModelProperty(value = "是否隐藏 0 否  1是", required = true)
    @ApiModelProperty(value = "是否隐藏所有商家 0 否  1是", required = true)
    private Integer hidden;
}