Merge branch 'develop' into develop2

src/custom/restcontroller/sale/itemgroup/itemgroup.java

@@ -1079,7 +1079,7 @@ public class itemgroup extends Controller {
             row.put("brand", brandRowsMap.get(row.getString("itemid")));
         }
         JSONObject oject = new JSONObject();
-        oject.put("customschemeItems", customschemeItems);
+        oject.put("customschemeItems", customschemeItems.toJsonArray());
         oject.put("colorRows", colorList);
         oject.put("specRows", specList);
         oject.put("materialRows", materialList);