Skip to content

D
dm_project
Commit 943329bd authored by machengbo's avatar machengbo
Browse files
Options

冲突解决

parent 58e75822
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 8 deletions
jz-dm-mall/src/main/java/com/jz/dm/mall/moduls/mapper/MallCustomerDao.java
View file @ 943329bd
...@@ -2,16 +2,9 @@ package com.jz.dm.mall.moduls.mapper; ...@@ -2,16 +2,9 @@ package com.jz.dm.mall.moduls.mapper;
import com.jz.common.base.BaseMapper; import com.jz.common.base.BaseMapper;
import com.jz.dm.mall.moduls.entity.MallCustomer; 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.Insert;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.ResultType; import org.apache.ibatis.annotations.Update;
import org.apache.ibatis.annotations.Select;
>>>>>>> 4f2273addb37e5eb2f1b255fb4f521ccb462856f
import java.util.Map;
/** /**
* 商城用户(TMallCustomer)表数据库访问层 * 商城用户(TMallCustomer)表数据库访问层
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment