Merge remote-tracking branch 'origin/dev' into dev

mitao

2025-04-03 e1cb4c48186a8b916bedd56c9bbc127febe6ee62

Merge remote-tracking branch 'origin/dev' into dev

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/FlowListenerService.java

@@ -999,8 +999,8 @@
                                }else{
                                    originalDays = Math.abs(ChronoUnit.DAYS.between(tBill.getStartTime(), tBill.getEndTime()))+1;
                                }
                                originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(originalDays)));
                            }
                            originalMoney = originalMoney.add(contract.getChangeRent().divide(new BigDecimal(30), 2, BigDecimal.ROUND_DOWN).multiply(new BigDecimal(originalDays)));
                            LocalDateTime originalTime = tBill.getStartTime().with(TemporalAdjusters.lastDayOfMonth()).plusDays(1);
                            while(true){
                                if (originalTime.isBefore(tBill.getEndTime())){