Merge branch 'developerB' of http://git.caimei365.com/caimei365/caimei365-www into developerB

src/main/java/com/caimei/www/mapper/CmBrandLandingMapper.java

@@ -2,6 +2,7 @@ package com.caimei.www.mapper;
 
 import java.util.List;
 
+import com.caimei.www.pojo.link.CmBrandLandingVO;
 import com.caimei.www.pojo.page.CmBrandLanding;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

src/main/java/com/caimei/www/service/page/impl/CmBrandLandingServiceImpl.java

@@ -3,6 +3,7 @@ package com.caimei.www.service.page.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.caimei.www.pojo.link.CmBrandLandingVO;
 import com.caimei.www.pojo.page.CmBrandLanding;
 import com.caimei.www.service.page.CmBrandLandingService;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/resources/mapper/CmBrandLandingMapper.xml

@@ -4,7 +4,7 @@
 		"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.www.mapper.CmBrandLandingMapper">
 
-	<resultMap type="CmBrandLanding" id="CmBrandLandingResult">
+	<resultMap type="com.caimei.www.pojo.page.CmBrandLanding" id="CmBrandLandingResult">
 		<result property="id"    column="id"    />
 		<result property="type"    column="type"    />
 		<result property="authUserId"    column="authUserId"    />
@@ -51,7 +51,7 @@
 			cm_brand_landing.addTime
 	</sql>
 
-	<select id="getByCmBrandLanding" parameterType="CmBrandLanding" resultMap="CmBrandLandingResult">
+	<select id="getByCmBrandLanding" parameterType="com.caimei.www.pojo.page.CmBrandLanding" resultMap="CmBrandLandingResult">
 		<include refid="selectCmBrandLandingVo"/>
 		from cm_brand_landing AS cm_brand_landing
 		<where>  cm_brand_landing.delFlag = 0
@@ -117,7 +117,7 @@
 		limit 0,1
 	</select>
 
-	<select id="getCmBrandLandingList" parameterType="CmBrandLandingVO" resultMap="CmBrandLandingResult">
+	<select id="getCmBrandLandingList" parameterType="com.caimei.www.pojo.link.CmBrandLandingVO" resultMap="CmBrandLandingResult">
 		<include refid="selectCmBrandLandingVo"/>
 		from cm_brand_landing AS cm_brand_landing
 		<where>  cm_brand_landing.delFlag = 0
@@ -182,7 +182,7 @@
 		order by cm_brand_landing.createTime desc
 	</select>
 
-	<select id="getCmBrandLandingCount" parameterType="CmBrandLanding" resultType="String">
+	<select id="getCmBrandLandingCount" parameterType="com.caimei.www.pojo.page.CmBrandLanding" resultType="String">
 		select count(1)
 		from cm_brand_landing AS cm_brand_landing
 		<where>  cm_brand_landing.delFlag = 0
@@ -252,7 +252,7 @@
 		where  cm_brand_landing.delFlag = 0 and cm_brand_landing.id = #{id}
 	</select>
 
-	<select id="getByIds" parameterType="CmBrandLanding" resultType="String">
+	<select id="getByIds" parameterType="com.caimei.www.pojo.page.CmBrandLanding" resultType="String">
 		select id
 		from cm_brand_landing AS cm_brand_landing
 		<where>  cm_brand_landing.delFlag = 0
@@ -316,7 +316,7 @@
 		group by cm_brand_landing.id
 	</select>
 
-	<select id="getById" parameterType="CmBrandLanding" resultType="String">
+	<select id="getById" parameterType="com.caimei.www.pojo.page.CmBrandLanding" resultType="String">
 		select id
 		from cm_brand_landing AS cm_brand_landing
 		<where>  cm_brand_landing.delFlag = 0
@@ -381,7 +381,7 @@
 		limit 0,1
 	</select>
 
-	<insert id="addCmBrandLanding" parameterType="CmBrandLanding" useGeneratedKeys="true" keyProperty="id">
+	<insert id="addCmBrandLanding" parameterType="com.caimei.www.pojo.page.CmBrandLanding" useGeneratedKeys="true" keyProperty="id">
 		insert into cm_brand_landing
 		<trim prefix="(" suffix=")" suffixOverrides=",">
 			<if test="id != null and id != ''">id,</if>
@@ -429,7 +429,7 @@
 		</trim>
 	</insert>
 
-	<update id="updateCmBrandLanding" parameterType="CmBrandLanding">
+	<update id="updateCmBrandLanding" parameterType="com.caimei.www.pojo.page.CmBrandLanding">
 		update cm_brand_landing
 		<trim prefix="SET" suffixOverrides=",">
 			<if test="type != null and type != ''">type = #{type},</if>
@@ -467,7 +467,7 @@
 		from cm_brand_landing where id = #{id}
 	</delete>
 
-	<delete id="delCmBrandLanding" parameterType="CmBrandLanding">
+	<delete id="delCmBrandLanding" parameterType="com.caimei.www.pojo.page.CmBrandLanding">
 		delete
 		from cm_brand_landing AS cm_brand_landing
 		<where>