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

tangxiaobao

2022-03-01 3358b2c450ed5aebfa1ee1aa5f699581b18593a7

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