Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-06 d6ef18f23c4b298cb9b977ab3a5d65e2f4a39fe2

 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")