Merge branch 'huacheng' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ i...

101captain

2022-04-13 2c7d6db898705a26274d93b703156d1446edad3d

 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 String merchantName;

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