From d5046e3c409be48c2a6151df6367be5dd6410dc2 Mon Sep 17 00:00:00 2001 From: 21819 Date: Mon, 22 Jan 2024 11:02:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E4=B8=BB=E5=88=86=E6=94=AF?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/biutag/mapper/system/PostMapper.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) 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 { -======== public interface PostMapper extends IBaseMapper { ->>>>>>>> master:mailbox-common/src/main/java/com/biutag/mapper/system/PostMapper.java -} +} \ No newline at end of file