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

无关风月

2025-04-21 1668fe1b912d07191c9fd7f20808d7d2162bc8e8

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/RecoveryServeRequest.java

@@ -35,11 +35,13 @@
    private String serveDescribe;

    @ApiModelProperty("预估价格")
    private BigDecimal estimatePrice;
    private String estimatePrice;

    @ApiModelProperty("默认回收价")
    private BigDecimal defaultPrice;

    @ApiModelProperty("回收补贴金")
    private BigDecimal recycleSubsidy;
    @ApiModelProperty("排序权重")
    private Integer sort;