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

yanghui

2022-10-21 ef676e6bff9e9fa9d95a8f621e9dbbbdf690e718

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