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

101captain

2022-06-06 72360aba85cc4ba1b0caf0823f63d0b81a26ce07

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

@@ -83,6 +83,9 @@
    @ApiModelProperty(value = "所属商家", hidden = true)
    private Long userId;

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

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