From a322c60e5fa8c4c7fc86ad24153d29592c3b8b05 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 17 四月 2025 11:51:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev

---
 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/RecoveryServe.java |    4 ++--
 1 files changed, 2 insertions(+), 2 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 dbae265..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
@@ -62,7 +62,7 @@
     private String rotate;
 
     @ApiModelProperty("回收补贴价")
-    @TableField("sys_recovery_serve")
-    private BigDecimal sysRecoveryServe;
+    @TableField("recycle_subsidy")
+    private BigDecimal recycleSubsidy;
 
 }

--
Gitblit v1.7.1