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

tangxiaobao

2021-09-06 5fc3fd7cbad93a8bc4a0d13f8217d4e2642450df

 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;

}