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

luoyuanqiao

2022-03-01 d76c9f4e730422cbe43496adfc57a6e3d36577ab

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