报错

src/main/java/com/template/services/SmartFaceDiscernService.java

@@ -47,10 +47,7 @@ public interface SmartFaceDiscernService extends IService<SmartFaceDiscern> {
 
     List<SmartFaceDiscern> toDateList(LocalDateTime start, LocalDateTime end);
 
-<<<<<<< HEAD
     List<FaceDiscernVo> queryFaceCountByDate(String startTime, String endTime);
-=======
-    List<SmartFaceDiscern> toDateAndPlacelist(LocalDateTime startTime, LocalDateTime endTime, String location);
 
->>>>>>> 0823994e062a148976ef1f1717c7038a0fd434ca
+    List<SmartFaceDiscern> toDateAndPlacelist(LocalDateTime startTime, LocalDateTime endTime, String location);
 }

src/main/java/com/template/services/impl/SmartFaceDiscernServiceImpl.java

@@ -322,17 +322,17 @@ public class SmartFaceDiscernServiceImpl extends ServiceImpl<SmartFaceDiscernMap
     }
 
     @Override
-<<<<<<< HEAD
     public List<FaceDiscernVo> queryFaceCountByDate(String startTime, String endTime) {
-        List<FaceDiscernVo> fdv = smartFaceDiscernMapper.queryFaceCountByDate(startTime,endTime);
+        List<FaceDiscernVo> fdv = smartFaceDiscernMapper.queryFaceCountByDate(startTime, endTime);
         return fdv;
-=======
+    }
+
+    @Override
     public List<SmartFaceDiscern> toDateAndPlacelist(LocalDateTime startTime, LocalDateTime endTime, String location) {
         LambdaQueryWrapper<SmartFaceDiscern> wrapper=new LambdaQueryWrapper<>();
         wrapper.between(SmartFaceDiscern::getDateTime,startTime,endTime)
                 .eq(SmartFaceDiscern::getLocation,location);
         List<SmartFaceDiscern> list = this.list(wrapper);
         return list;
->>>>>>> 0823994e062a148976ef1f1717c7038a0fd434ca
     }
 }