Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pom.xml
#	src/main/java/com/cx/cn/cxquartz/controller/ExtController.java
#	src/main/java/com/cx/cn/cxquartz/controller/IndexController.java
#	src/main/java/com/cx/cn/cxquartz/controller/QuartzController.java
#	src/main/java/com/cx/cn/cxquartz/controller/SbtdspsrController.java
#	src/main/java/com/cx/cn/cxquartz/dao/QuartzTaskInformationsMapper.java
#	src/main/java/com/cx/cn/cxquartz/dao/SbtdspsrMapper.java
#	src/main/java/com/cx/cn/cxquartz/dao/TraffPictureMapper.java
#	src/main/java/com/cx/cn/cxquartz/service/quartz/FtpService.java
#	src/main/java/com/cx/cn/cxquartz/service/quartz/QuartzService.java
#	src/main/java/com/cx/cn/cxquartz/service/quartz/QuartzTaskInformationsService.java
#	src/main/java/com/cx/cn/cxquartz/service/quartz/SbtdspsrService.java
#	src/main/java/com/cx/cn/cxquartz/service/quartz/TraffPictureService.java
#	src/main/java/com/cx/cn/cxquartz/service/quartz/impl/QuartzServiceImpl.java
#	src/main/java/com/cx/cn/cxquartz/service/quartz/impl/QuartzTaskInformationsServiceImpl.java
#	src/main/java/com/cx/cn/cxquartz/service/quartz/impl/SbtdspsrImpl.java
#	src/main/java/com/cx/cn/cxquartz/service/quartz/impl/TraffpictureServiceImpl.java
#	src/main/java/com/cx/cn/cxquartz/util/FTPUtil.java
#	src/main/java/com/cx/cn/cxquartz/util/FileTransferManager.java
#	src/main/java/com/cx/cn/cxquartz/util/RestTemplateConfig.java
#	src/main/java/com/cx/cn/cxquartz/vo/ImageList.java
#	src/main/java/com/cx/cn/cxquartz/vo/ObjectBoundingBox.java
#	src/main/java/com/cx/cn/cxquartz/vo/Output.java
#	src/main/java/com/cx/cn/cxquartz/vo/ResultObj.java
#	src/main/java/com/cx/cn/cxquartz/vo/TraffpictureParam.java
#	src/main/resources/application.yml
#	src/main/resources/file.properties
#	src/main/resources/mapper/FaceMapper.xml
#	src/main/resources/mapper/PedestrianMapper.xml
#	src/main/resources/mapper/PeopleridebicycMapper.xml
#	src/main/resources/mapper/QuartzTaskInformationsMapper.xml
#	src/main/resources/mapper/SbtdspsrMapper.xml
#	src/main/resources/mapper/TraffAlarmRecordMapper.xml
#	src/main/resources/mapper/TraffPictureMapper.xml
#	src/main/resources/templates/addtask.html
#	src/main/resources/templates/index.html
#	src/main/resources/templates/updatetask.html
#	src/test/java/com/quartz/cn/com/cx/cn/cxquartz/CXQuartzApplicationTests.java