1、合并冲突

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

@@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cmeeting.ad.entity.RobotSecurityUser;
 import com.cmeeting.ad.util.SecurityUtil;
 import com.cmeeting.constant.MeetingTypeConstant;
-import com.cmeeting.constant.PermissionPruposeType;
+import com.cmeeting.constant.RecordTemplateConstant;
 import com.cmeeting.dto.MeetTypeDto;
 import com.cmeeting.exception.RobotBaseException;
 import com.cmeeting.mapper.primary.MeetTemplateEnableMapper;
@@ -65,7 +65,7 @@ public class MeetTypeServiceImpl extends ServiceImpl<MeetTypeMapper, MeetType>
         RobotSecurityUser loginUser = SecurityUtil.getUser();
         // 校验管理员身份
         String role = loginUser.getRole();
-        if (!"admin".equals(role)) {
+        if (!RecordTemplateConstant.TEMPLATE_TYPE_SYSTEM.equals(role)) {
             throw new RobotBaseException("非管理员用户不允许创建会议类型");
         }
         MeetType meetType = new MeetType();