Merge branch 'develop' into develop2

src/custom/restcontroller/webmanage/sale/dispatch/dispatchItems.java

@@ -69,7 +69,7 @@ public class dispatchItems extends Controller {
         sqlFactory.addParameter_SQL("where", where);
         sqlFactory.addParameter("sys_enterpriseid", content.getLong("sys_enterpriseid"));
         sqlFactory.addParameter("siteid", siteid);
-        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL(false));
+        Rows rows = dbConnect.runSqlQuery(sqlFactory.getSQL());
 
         return getSucReturnObject().setData(rows).toString();
     }