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

无关风月

4 天以前 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/EvaluateOrderInfoVO.java

@@ -42,4 +42,12 @@
    @ApiModelProperty("回收服务id")
    private Integer serveId;

    @ApiModelProperty("是否评价(0:未评价；1:已评价)")
    private Integer isEvaluate;
    @ApiModelProperty("预约地址")
    private String reservationAddress;
    @ApiModelProperty("详细地址")
    private String address;


}