From ecc3636bffbcf6cc746125c28689ef19d7a9d4cb Mon Sep 17 00:00:00 2001
From: luofl <1442745593@qq.com>
Date: 星期四, 20 三月 2025 15:49:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java
index b2e6c81..98867a6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java
@@ -956,7 +956,7 @@
LocalDateTime originalTime = tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).plusDays(1);
while(true){
if (originalTime.isBefore(tBill.getEndTime())){
- if (originalTime.plusMonths(1).isBefore(tContractRentType.getChangeTime())){
+ if (originalTime.plusMonths(1).isBefore(tBill.getEndTime())){
originalMoney = originalMoney.add(contract.getChangeRent());
originalTime = originalTime.plusMonths(1);
}else {
--
Gitblit v1.7.1