# Conflicts:
#	pom.xml
#	src/main/java/com/cx/cn/cxquartz/bean/GoalStructureParam.java
#	src/main/java/com/cx/cn/cxquartz/config/PerformedTaskCornChange.java
#	src/main/java/com/cx/cn/cxquartz/config/RabbitConfig.java
#	src/main/java/com/cx/cn/cxquartz/config/RestTemplateConfig.java
#	src/main/java/com/cx/cn/cxquartz/config/SendToDXConfig.java
#	src/main/java/com/cx/cn/cxquartz/config/SendToVoiceConfig.java
#	src/main/java/com/cx/cn/cxquartz/config/TaskComsumExchangeConfig.java
#	src/main/java/com/cx/cn/cxquartz/config/getSnapShotConfig.java
#	src/main/java/com/cx/cn/cxquartz/controller/ExtController.java
#	src/main/java/com/cx/cn/cxquartz/dao/LJTMyjcResultMapper.java
#	src/main/java/com/cx/cn/cxquartz/dao/TraffAlarmRecordMapper.java
#	src/main/java/com/cx/cn/cxquartz/rabbitmq/QueueConstants.java
#	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/BaseConsumer.java
#	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/BaseConsumerProxy.java
#	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/SendToDXConsumer.java
#	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/SendToVoiceConsumer.java
#	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/SnapShotConsumer.java
#	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/listener/AutoSnapReceiver.java
#	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/listener/RTSPorHLSReceiver.java
#	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/listener/SendtoDXReceiver.java
#	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/listener/SendtoVoiceAlarmReceiver.java
#	src/main/java/com/cx/cn/cxquartz/rabbitmq/comsumer/listener/SnapTaskReceiver.java
#	src/main/java/com/cx/cn/cxquartz/rabbitmq/producer/callback/ConsumerConfirmAndReturnCallback.java
#	src/main/java/com/cx/cn/cxquartz/service/quartz/impl/EventWriteService.java
#	src/main/java/com/cx/cn/cxquartz/service/quartz/impl/VideoRTSPorURLService.java
#	src/main/java/com/cx/cn/cxquartz/util/CommonUtil.java
#	src/main/java/com/cx/cn/cxquartz/util/DateUtils.java
#	src/main/java/com/cx/cn/cxquartz/util/PointUtil.java
#	src/main/java/com/cx/cn/cxquartz/util/RestUtil.java
#	src/main/java/com/cx/cn/cxquartz/vo/Sbtdspsr.java
#	src/main/java/com/cx/cn/cxquartz/vo/TraffAlarmRecord.java
#	src/main/java/com/cx/cn/cxquartz/vo/Traffpicture.java
#	src/main/java/com/cx/cn/cxquartz/vo/VoiceData.java
#	src/main/resources/application-local.yml
#	src/main/resources/application.yml
#	src/main/resources/logback-spring.xml
#	src/main/resources/mapper/LJTMyjcResultMapper.xml
#	src/main/resources/mapper/SbtdspsrMapper.xml
#	src/main/resources/mapper/TraffPictureMapper.xml
#	src/test/java/com/quartz/cn/com/cx/cn/cxquartz/CXQuartzApplicationTests.java