Merge remote-tracking branch '喜望/dev-2.0' into dev-2.0

mitao

2025-03-18 d8e7ad6acb9f6105ac6ff6fe2ce892e622cde256

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

@@ -146,6 +146,8 @@
    @ApiModelProperty(value = "商家类型名称")
    private String merchantTypeName;

    @ApiModelProperty(value = "商家评分")
    private String merchantGrade;

    @ApiModelProperty(value = "商家积分")
    private String merchantIntegral;