Merge branch 'local_20221010' into haucheng_panzhihua

yanghui

2022-10-13 e5d95a1d3d00710a9f4a1c3cd9c8bb87c274bde1

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/community/microCommercialStreet/McsMerchantDTO.java

@@ -85,4 +85,7 @@

    @ApiModelProperty(value = "用户头像", hidden = true)
    private String imageUrl;

    @ApiModelProperty(value = "openId", hidden = true)
    private String openId;
}