From d66b806d685672f2f817986e89f69fb09d130f11 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 09 四月 2025 18:02:32 +0800
Subject: [PATCH] Merge branch 'xizang-changyun' of https://gitee.com/xiaochen991015/xizang into dev

---
 ruoyi-system/src/main/java/com/ruoyi/system/dto/TbillSaveDto.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TbillSaveDto.java b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TbillSaveDto.java
index c7869f5..53a19ad 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/dto/TbillSaveDto.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/dto/TbillSaveDto.java
@@ -6,6 +6,7 @@
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
@@ -13,8 +14,11 @@
 
     @ApiModelProperty(value = "水电费列表")
     private List<TBillDetail> details;
-
-
+    /**
+     *
+     */
+    @ApiModelProperty(value = "调整金额(有违约金,就调整违约金并调整欠费,没有违约金,就直接调整欠费)")
+    private BigDecimal editAmount;
 
 
 }

--
Gitblit v1.7.1