冲突解决

jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/mapper/MallCustomerDao.java

@@ -2,16 +2,9 @@ package com.jz.dm.mall.moduls.mapper;
 
 import com.jz.common.base.BaseMapper;
 import com.jz.dm.mall.moduls.entity.MallCustomer;
-<<<<<<< HEAD
-import org.apache.ibatis.annotations.*;
-=======
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.ResultType;
-import org.apache.ibatis.annotations.Select;
->>>>>>> 4f2273addb37e5eb2f1b255fb4f521ccb462856f
-
-import java.util.Map;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * 商城用户(TMallCustomer)表数据库访问层