Merge branch 'master' of zcb/kmall-pt-general into master

kmall-admin/src/main/resources/mybatis/mapper/alarm/Mall2ShippingReminderAlarmDao.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.kmall.dao.Mall2ShippingReminderAlarmDao">
+<mapper namespace="com.kmall.admin.dao.alarm.Mall2ShippingReminderAlarmDao">
 
-    <resultMap type="com.kmall.entity.Mall2ShippingReminderAlarmEntity" id="mall2ShippingReminderAlarmMap">
+    <resultMap type="com.kmall.admin.entity.alarm.Mall2ShippingReminderAlarmEntity" id="mall2ShippingReminderAlarmMap">
         <result property="msraId" column="msra_id"/>
         <result property="goodsId" column="goods_id"/>
         <result property="goodsName" column="goods_name"/>
@@ -22,7 +22,7 @@
         <result property="tstm" column="tstm"/>
     </resultMap>
 
-	<select id="queryObject" resultType="com.kmall.entity.Mall2ShippingReminderAlarmEntity">
+	<select id="queryObject" resultType="com.kmall.admin.entity.alarm.Mall2ShippingReminderAlarmEntity">
 		select
 			`msra_id`,
 			`goods_id`,
@@ -44,7 +44,7 @@
 		where msra_id = #{id}
 	</select>
 
-	<select id="queryList" resultType="com.kmall.entity.Mall2ShippingReminderAlarmEntity">
+	<select id="queryList" resultType="com.kmall.admin.entity.alarm.Mall2ShippingReminderAlarmEntity">
 		select
     		`msra_id`,
     		`goods_id`,
@@ -79,7 +79,7 @@
 			limit #{offset}, #{limit}
 		</if>
 	</select>
-	
+
  	<select id="queryTotal" resultType="int">
 		select count(*) from mall2_shipping_reminder_alarm
 		WHERE 1=1
@@ -87,8 +87,8 @@
             AND name LIKE concat('%',#{name},'%')
         </if>
 	</select>
-	 
-	<insert id="save" parameterType="com.kmall.entity.Mall2ShippingReminderAlarmEntity">
+
+	<insert id="save" parameterType="com.kmall.admin.entity.alarm.Mall2ShippingReminderAlarmEntity">
 		insert into mall2_shipping_reminder_alarm(
 			`msra_id`,
 			`goods_id`,
@@ -124,9 +124,9 @@
 			#{modTime},
 			#{tstm})
 	</insert>
-	 
-	<update id="update" parameterType="com.kmall.entity.Mall2ShippingReminderAlarmEntity">
-		update mall2_shipping_reminder_alarm 
+
+	<update id="update" parameterType="com.kmall.admin.entity.alarm.Mall2ShippingReminderAlarmEntity">
+		update mall2_shipping_reminder_alarm
 		<set>
 			<if test="goodsId != null">`goods_id` = #{goodsId}, </if>
 			<if test="goodsName != null">`goods_name` = #{goodsName}, </if>
@@ -146,16 +146,16 @@
 		</set>
 		where msra_id = #{msraId}
 	</update>
-	
+
 	<delete id="delete">
 		delete from mall2_shipping_reminder_alarm where msra_id = #{value}
 	</delete>
-	
+
 	<delete id="deleteBatch">
-		delete from mall2_shipping_reminder_alarm where msra_id in 
+		delete from mall2_shipping_reminder_alarm where msra_id in
 		<foreach item="msraId" collection="array" open="(" separator="," close=")">
 			#{msraId}
 		</foreach>
 	</delete>
 
-</mapper>
+</mapper>