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

bd-business/bd-business-member/src/main/java/com/hzs/retail/member/utils/DataStatisticsUtil.java

@@ -56,13 +56,10 @@ public class DataStatisticsUtil {
             // 昨日非激活 排除昨日日结表数据
             excludeDailySettlementData(detailVOList);
         }
-        /**
-         * 2025年6月17日 团队盒数不包含注水,在此无需再次排除
         else{
             // 排除注水数据
             excludeWaterInjectionData(detailVOList, pkId);
         }
-         */
         CuMemberRetailDataStatisticsDetailVO bigRangeBox = getBigRangeBoxDetailVO(detailVOList, pkId);
         CuMemberRetailDataStatisticsDetailVO bigRangePv = getBigRangePVDetailVO(detailVOList, pkId);
         Integer smallRangeTotalBoxNum = total.getTotalBoxNum() - bigRangeBox.getTotalBoxNum();