fix conflict

Helius

2022-02-14 59cf24b0aba393e145f4ba3d58e98b7a01a80992

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java

@@ -674,5 +674,13 @@
   }


   @Override
   public List<Map<String, Object>> findVipArrearsStatistics(SysVipInfo sysVipInfo, PaginationVO pageVo) {
      return sysVipInfoDao.selectVipArrearsStatistics(sysVipInfo, pageVo);
   }

   @Override
   public Integer findVipArrearsStatisticsTotal(SysVipInfo sysVipInfo) {
      return sysVipInfoDao.selectVipArrearsStatisticsTotal(sysVipInfo);
   }
}