Merge remote-tracking branch 'origin/master'

xuhy

2025-01-15 94ae02e6f73b7011f0fcf6acff8636341d35351d

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/RecoveryServe.java

@@ -43,7 +43,7 @@

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

    @ApiModelProperty("默认回收价")
    @TableField("default_price")