sdsd

src/main/java/com/template/controller/SmartScoreController.java

@@ -875,13 +875,8 @@ public class SmartScoreController implements SmartScoreControllerAPI {
         ArrayList<AverageScoreVo> averageScoreVos = new ArrayList<>();
         for (SmartSubject smartSubject : list) {
             AverageScoreVo averageScoreVo = new AverageScoreVo();
-<<<<<<< HEAD
-            Integer smartSemesterId = smartSemester.getId();
-            Double score = smartScoreService.getAverageScore(userId, semesterId, smartSemesterId);
-=======
             Integer smartSemesterId = smartSubject.getId();
             Double score =smartScoreService.getAverageScore(userId,semesterId,smartSemesterId);
->>>>>>> bd8f058060bfbc1ceb005ce7b419e5ca1990b6d0
             averageScoreVo.setSubjectName(smartSubject.getName());
             if (ObjectUtils.isNotEmpty(score)) {
                 averageScoreVo.setScore(score);