Merge branch 'wanghaicheng' of lift-manager/lift-server into develop

lift-common/src/main/java/cn.com.ty.lift.common/constants/SqlConstants.java

@@ -151,7 +151,7 @@ public interface SqlConstants {
                     "   from region r" +
                     "         left join user_info ui on r.user_id = ui.user_id" +
                     "     where mt_company_id = #{mtCompanyId}" +
-                    "       and r.area_name like '%${name}%' and ui.name like '%${name}%'" +
+                    "       and (r.area_name like '%${name}%' or ui.name like '%${name}%')" +
                     "   order by create_time desc";
 
     //根据用户id查询待维保数量