# Conflicts:
#	pom.xml
#	src/main/java/com/cmeeting/TencentMeetingCallbackApplication.java
#	src/main/java/com/cmeeting/ad/controller/UserController.java
#	src/main/java/com/cmeeting/ad/service/UserService.java
#	src/main/java/com/cmeeting/ad/service/impl/UserServiceImpl.java
#	src/main/java/com/cmeeting/constant/RecordTemplateConstant.java
#	src/main/java/com/cmeeting/controller/MeetingInfoController.java
#	src/main/java/com/cmeeting/email/EmailSender.java
#	src/main/java/com/cmeeting/job/CmeetingJob.java
#	src/main/java/com/cmeeting/job/EmailPushTask.java
#	src/main/java/com/cmeeting/job/FileProcessTask.java
#	src/main/java/com/cmeeting/service/FileProcessProducer.java
#	src/main/java/com/cmeeting/service/MeetingInfoService.java
#	src/main/java/com/cmeeting/service/impl/MeetingInfoServiceImpl.java
#	src/main/java/com/cmeeting/service/impl/TencentMeetingServiceImpl.java
#	src/main/resources/application.yml
#	src/main/resources/mapper/primary/MeetingInfoMapper.xml