Merge remote-tracking branch 'origin/develop' into develop

mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml

@@ -39,8 +39,8 @@
 		<if test=" null != type ">
 			and cc.`type` = #{type}
 		</if>
-
-		<if test=" null != title ">
+		
+		<if test=" null != title and ''!= title">
 			and cc.`title`  like concat('%', #{title},'%')
 		</if>