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

src/custom/restcontroller/webmanage/sale/order/Order.java

@@ -231,7 +231,8 @@ public class Order extends Controller {
             JSONObject item = (JSONObject) obj;
             Long temp_sa_brandid = item.getLongValue("sa_brandid");
             itemidids.add(item.getLongValue("itemid"));
-            sa_shoppingcartids.add(item.getLongValue(" sa_shoppingcartid"));
+            sa_shoppingcartids.add(item.getLongValue("sa_shoppingcartid"));
+
             if (sa_brandid == 0) {
                 sa_brandid = temp_sa_brandid;
             }