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

无关风月

5 天以前 3044a637a15e09d50ad733fd482c6e64e90df2f9

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

@@ -19,6 +19,8 @@

    @ApiModelProperty("是否还未评价")
    private Boolean evaluate;
    @ApiModelProperty("回收服务id")
    private Integer serveId;

    public Boolean getEvaluate() {
        return null != evaluateInfo;