# Conflicts: # zc-business/src/main/java/com/zc/business/mapper/DcGantryStatisticsDataMapper.java # zc-business/src/main/java/com/zc/business/service/IDcTrafficStatisticsService.java # zc-business/src/main/java/com/zc/business/service/impl/DcGantryStatisticsDataImpl.java # zc-business/src/main/java/com/zc/business/service/impl/DcTrafficStatisticsServiceImpl.java
