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

无关风月

2025-04-21 1668fe1b912d07191c9fd7f20808d7d2162bc8e8

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

@@ -60,7 +60,9 @@
    @ApiModelProperty("轮播图片")
    @TableField("rotate")
    private String rotate;

    @ApiModelProperty("回收补贴金")
    @TableField("recycle_subsidy")
    private BigDecimal recycleSubsidy;
    @ApiModelProperty("是否收藏")
    @TableField(exist = false)
    private Boolean isCollect;