From bd01134a03c422fc3f1814df6a5ddf9df4c5c4df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= <soldierliuli@hotmail.com>
Date: Tue, 31 May 2022 14:29:46 +0800
Subject: [PATCH] commit code

---
 .../dictionary/service/impl/ArchivesTypeServiceImpl.java   | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java
index 34e622f..ac0086a 100644
--- a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java
+++ b/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
 }