From 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 14:37:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/RecoveryServeRequest.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/RecoveryServeRequest.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/RecoveryServeRequest.java
index 4ee7035..2453bc5 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/request/RecoveryServeRequest.java
+++ b/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;
@@ -62,6 +64,7 @@
recoveryServe.setSort(getSort());
recoveryServe.setCover(getCover());
recoveryServe.setRotate(getRotate());
+ recoveryServe.setRecycleSubsidy(getRecycleSubsidy());
return recoveryServe;
}
--
Gitblit v1.7.1