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/entity/RecoveryServe.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/RecoveryServe.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/RecoveryServe.java
index 7377188..3291f68 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/RecoveryServe.java
+++ b/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")
@@ -61,4 +61,8 @@
@TableField("rotate")
private String rotate;
+ @ApiModelProperty("回收补贴价")
+ @TableField("recycle_subsidy")
+ private BigDecimal recycleSubsidy;
+
}
--
Gitblit v1.7.1