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

无关风月

10 天以前 f135f2c8c08b16ac25a4e8e0398418ab3ce1e620

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/vo/OrderByServeVO.java

@@ -26,5 +26,9 @@

    @ApiModelProperty("回收价格")
    private BigDecimal price;
    private BigDecimal subsidy;

    @ApiModelProperty("封面图片")
    private String cover;

}