Merge branch 'master' into test

puhanshu

2021-12-24 afd27e98fd0d3df475289c56bd96595d81fa5b9b

 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;
}