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

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

@@ -270,7 +270,7 @@ public class dispatchItems extends Controller {
         //System.out.println(object.toString());
         if(siteid.equalsIgnoreCase("lsa")){
             String result = request.doPost(object.toString(),
-                "http://60.190.151.198:8089/BYESB/jaxrs/webclientrest");
+                    "http://60.190.151.198:8089/BYESB/jaxrs/webclientrest");
             if(isJSONArray(result)){
                 jsonArray = JSONArray.parseArray(result);
             }