Merge remote-tracking branch 'origin/20210223' into 20210223

operation_manager/src/main/java/com/huaxu/evaluation/service/impl/EvaluationCycleServiceImpl.java

@@ -80,7 +80,6 @@ public class EvaluationCycleServiceImpl extends ServiceImpl<EvaluationCycleMappe
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    @Override
     public boolean delEvaluationCycleByIds(Long[] ids) {
         return this.removeByIds(Arrays.asList(ids));
     }