commit code

archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java

@@ -26,7 +26,6 @@ import java.util.Map;
 @Service
 @RequiredArgsConstructor
 public class ArchivesTypeServiceImpl implements ArchivesTypeService {
-<<<<<<< HEAD
 
 
     private final ArchivesTypeMapper archivesTypeMapper;
@@ -67,10 +66,4 @@ public class ArchivesTypeServiceImpl implements ArchivesTypeService {
 
     }
 
-=======
-    @Override
-    public void create() {
-
-    }
->>>>>>> 61a63764921d46c288b3b64dfdec88aec91f21b9
 }