diff --git a/mailbox-common/src/main/java/com/biutag/mapper/system/PostMapper.java b/mailbox-common/src/main/java/com/biutag/mapper/system/PostMapper.java
index 2dd8661..07c62bd 100644
--- a/mailbox-common/src/main/java/com/biutag/mapper/system/PostMapper.java
+++ b/mailbox-common/src/main/java/com/biutag/mapper/system/PostMapper.java
@@ -1,20 +1,10 @@
 package com.biutag.mapper.system;
-
 import com.biutag.core.basics.IBaseMapper;
-<<<<<<<< HEAD:mailbox-common/src/main/java/com/biutag/mapper/system/DeptMapper.java
-import com.biutag.entity.system.Dept;
-========
 import com.biutag.entity.system.Post;
->>>>>>>> master:mailbox-common/src/main/java/com/biutag/mapper/system/PostMapper.java
 import org.apache.ibatis.annotations.Mapper;
-
 /**
  * 系统岗位Mapper
  */
 @Mapper
-<<<<<<<< HEAD:mailbox-common/src/main/java/com/biutag/mapper/system/DeptMapper.java
-public interface DeptMapper extends IBaseMapper<Dept> {
-========
 public interface PostMapper extends IBaseMapper<Post> {
->>>>>>>> master:mailbox-common/src/main/java/com/biutag/mapper/system/PostMapper.java
-}
+}
\ No newline at end of file