fanli-server.git

Merge branch 'div_9'

Conflicts:
fanli/src/main/java/com/yeshi/fanli/dao/mybatis/taobao/dataoke/DaTaoKeDetailMapper.java
fanli/src/main/java/com/yeshi/fanli/mapping/taobao/dataoke/DaTaoKeDetailMapper.xml

			@@ -72,7 +72,7 @@
			<select id="getGoodsNotInList" resultMap="BaseResultMap">
			SELECT * FROM `yeshi_ec_goods_dataoke` d
			WHERE 1=1
			<if test="cid != null">
			<if test="cid != null and cid !=0">
			AND d.`cid` = #{cid}
			</if>
			<if test="list != null">
			@@ -91,6 +91,7 @@
			</select>


			<<<<<<< HEAD
			<select id="listSearchByTitleWithCid" resultMap="BaseResultMap">
			select
			<include refid="Base_Column_List" />