Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -178,7 +178,7 @@
 		<where>
 			 qu.tenant_id_ = #{tenantId}
 			<if test="search != null and search != ''">
-				AND (qu.user_id_ = #{search} OR ria.username_ LIKE CONCAT('%',#{search},'%') OR ria.mobile_no_ LIKE CONCAT('%',#{search},'%'))
+				AND (qu.user_id_ = #{search} OR ria.user_name_ LIKE CONCAT('%',#{search},'%') OR ria.mobile_no_ LIKE CONCAT('%',#{search},'%'))
 			</if>
 			<if test="activeId != null">
 				AND qu.active_id_ = #{activeId}