1、合并冲突

src/main/java/com/cmeeting/service/impl/MeetingRecordTemplateServiceImpl.java

@@ -310,7 +310,7 @@ public class MeetingRecordTemplateServiceImpl extends ServiceImpl<MeetingRecordT
         RobotSecurityUser loginUser = SecurityUtil.getUser();
         if (loginUser.getRole().equals(RecordTemplateConstant.TEMPLATE_TYPE_SYSTEM)) {
             // TODO
-            
+
             return;
         }
         String userId = String.format("%08d", loginUser.getUserId());