Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-dc into develop
							
							
							
							
							
							
								
							
							
							# 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 
							
						 |