Merge branch 'bug' into ljc_1.1

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysManualMapper.xml

@@ -58,7 +58,7 @@
 				AND sm.menu_id_ = #{menuId}
 			</if>
 			<if test="search != null and search != '' ">
-				AND (sm.name_ like concat('%', #{search} '%') )
+				AND (sm.name_ like concat('%', #{search} '%') or sm.id_  like concat('%', #{search} '%')  or u.phone_ like concat('%', #{search} '%')  )
 			</if>
 		</where>
 		<include refid="global.limit" />