From b8e7bb1791ff41be5ee8150cc46af082d7444a65 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 31 五月 2023 01:02:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java b/service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java
index eebb1dc..d419eb6 100755
--- a/service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/smo/impl/GeneratorFeeYearStatisticsInnerServiceSMOImpl.java
@@ -385,9 +385,9 @@
= BeanConvertUtil.covertBeanList(reportFeeYearCollectionDetailServiceDaoImpl.getReportFeeYearCollectionDetailInfo(BeanConvertUtil.beanCovertMap(reportFeeYearCollectionDetailDto)),
ReportFeeYearCollectionDetailDto.class);
- if (!ListUtil.isNull(reportFeeYearCollectionDetailDtos) && year != curYear) { // 璇存槑宸茬粡澶勭悊杩囦簡 涓嶅啀澶勭悊
- return;
- }
+// if (!ListUtil.isNull(reportFeeYearCollectionDetailDtos) && year != curYear) { // 璇存槑宸茬粡澶勭悊杩囦簡 涓嶅啀澶勭悊
+// return;
+// }
double receivableAmount = feeDto.getFeePrice();
--
Gitblit v1.8.0