Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

luoxinwu

2024-03-05 c88d1658a2b6b51ed1a81c3be3e9102b661970f3

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/VolunteerMerchant.java

@@ -154,6 +154,10 @@
    @ApiModelProperty(value = "商家评分")
    private String merchantGrade;

    @TableField(exist = false)
    @ApiModelProperty(value = "商家商品数量")
    private String goodNum;

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