Merge branch 'hemenkou_dev' into dev

101captain

2022-03-02 60784a329fd3cf9f4b6a75b8dc39ff79bd907dc6

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/microCommercialStreet/McsInformationVO.java

@@ -49,6 +49,9 @@
    @ApiModelProperty("所属商家")
    private Long merchantId;

    @ApiModelProperty("所属商家名称")
    private Long merchantName;
    @ApiModelProperty("资讯内容")
    private String merchantName;

    @ApiModelProperty("商家信息")
    private McsMerchantVO merchantInfo;
}