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

mec-biz/src/main/resources/config/mybatis/LuckDrawLogMapper.xml

@@ -30,10 +30,10 @@
 				and l.user_id_ = #{userId}
 			</if>
 			<if test="name != null">
-				and d.name_ like '%' #{name} '%'
+				and d.name_ like concat('%',#{name},'%')
 			</if>
 			<if test="rewardType != null">
-				and d.reward_type_ like '%' #{rewardType} '%'
+				and d.reward_type_ like concat('%',#{rewardType},'%')
 			</if>
 			<if test="groupId != null">
 				and l.group_id_ = #{groupId}
@@ -103,7 +103,7 @@
 		left join sys_user u on u.id_=l.user_id_
 		left join organization o on o.id_ = u.organ_id_
 		<include refid="queryCondition" />
-		<include refid="global.orderby" />
+		order by l.create_on_ desc
 		<include refid="global.limit" />
 	</select>
 </mapper>