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

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

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