Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-11-28 29952e1e673e87d4ac1fc8f7c2d6088c975fa99f

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