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

src/custom/restcontroller/webmanage/sale/logistics/LSALogistics.java

@@ -271,7 +271,6 @@ public class LSALogistics extends Controller {
         }
 
         QuerySQL querySQL = SQLFactory.createQuerySQL(this, "sa_logistics");
-        querySQL.setTableAlias("t1");
         querySQL.addJoinTable(JOINTYPE.left, "sys_enterprise", "t2", "t2.sys_enterpriseid=t1.sys_enterpriseid and t2.siteid=t1.siteid",
                 "t2.enterprisename");
         querySQL.addJoinTable(JOINTYPE.left, "sa_agents", "t3", "t3.sys_enterpriseid=t2.sys_enterpriseid and t3.siteid=t2.siteid",
@@ -285,6 +284,7 @@ public class LSALogistics extends Controller {
             querySQL.setWhere("t1.status !='新建'");
         }
         querySQL.setWhere(where.toString());
+        querySQL.setPage(pageSize,pageNumber).setOrderBy(pageSorting).setTableAlias("t1");
         Rows rows = querySQL.query();
 
         for (Row row : rows) {