修复丢失文件

gym-manage-api/gym-checkIn/src/test/java/cn/novalon/gym/manage/checkin/CheckInModuleTest.java

@@ -25,10 +25,7 @@ import reactor.test.StepVerifier;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-<<<<<<< HEAD
-=======
 import java.time.LocalTime;
->>>>>>> f52451d (feat: 添加签到模块和数据库表结构)
 import java.util.HashMap;
 import java.util.Map;