Merge remote-tracking branch 'origin/test' into test

CeDo

2021-05-31 2af7739a8517d2d54c0b4f14af5c77e036cf653e

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