Merge branch 'saas_2022_05_17_activity' of http://git.dayaedu.com/yonge/mec into master_saas

 Conflicts:

	mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

mec-biz/src/main/java/com/ym/mec/biz/service/ClassGroupService.java

@@ -12,7 +12,6 @@ import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.common.service.BaseService;
-import org.apache.ibatis.annotations.Param;
 
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
@@ -598,7 +597,7 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      * @return
      * @author zouxuan
      */
-    int batchUpdateLockByClassGroupIds(List<Integer> classGroupIds,int lockFlag);
+    void batchUpdateLockByClassGroupIds(List<Integer> classGroupIds,int lockFlag);
 
     //修改班级基本信息
     int updateClassGroup(ClassGroup classGroup);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.auth.api.entity.SysUserRole;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.*;
@@ -41,7 +40,6 @@ import java.math.BigDecimal;
 import java.time.*;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 import static com.ym.mec.biz.dal.entity.CourseSchedule.CourseScheduleType.*;
@@ -3413,6 +3411,12 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
     @Override
     @Transactional(rollbackFor = Exception.class)
+    public void batchUpdateLockByClassGroupIds(List<Integer> classGroupIds, int lockFlag) {
+        classGroupDao.batchUpdateLockByClassGroupIds(classGroupIds, lockFlag);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
     public int updateClassGroup(ClassGroup classGroup) {
         ClassGroup group = classGroupDao.get(classGroup.getId());
         if(Objects.isNull(group)){