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/VolunteerMerchantEvaluate.java

@@ -80,6 +80,13 @@
    private String evaluateGrade;


    /**
     * 订单id
     */
    @ApiModelProperty(value = "订单id")
    private String orderId;


    @TableField(exist = false)
    @ApiModelProperty(value = "商家名称")
    private String merchantName;