|
@@ -2,8 +2,6 @@
|
|
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
|
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
|
|
<mapper namespace="com.huimv.guowei.admin.mapper.BaseScreenCameraAccountMapper">
|
|
<mapper namespace="com.huimv.guowei.admin.mapper.BaseScreenCameraAccountMapper">
|
|
|
|
|
|
|
|
-<<<<<<< Updated upstream
|
|
|
|
|
-=======
|
|
|
|
|
<!-- 通用查询映射结果 -->
|
|
<!-- 通用查询映射结果 -->
|
|
|
<resultMap id="BaseResultMap" type="com.huimv.guowei.admin.entity.BaseScreenCameraAccount">
|
|
<resultMap id="BaseResultMap" type="com.huimv.guowei.admin.entity.BaseScreenCameraAccount">
|
|
|
<id column="id" property="id" />
|
|
<id column="id" property="id" />
|
|
@@ -12,5 +10,4 @@
|
|
|
<result column="account_id" property="accountId" />
|
|
<result column="account_id" property="accountId" />
|
|
|
</resultMap>
|
|
</resultMap>
|
|
|
|
|
|
|
|
->>>>>>> Stashed changes
|
|
|
|
|
</mapper>
|
|
</mapper>
|
