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

src/custom/restcontroller/webmanage/sale/item/Item.java

@@ -508,9 +508,12 @@ public class Item extends Controller {
             } else {
                 row.put("attinfos", attRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
             }
-            row.put("tradefield", tradefieldRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
+            String[] tradefield = tradefieldRowsMap.getOrDefault(row.getString("itemid"), new Rows()).toArray("tradefield");
+            row.put("tradefield", StringUtils.join(tradefield, ","));
             row.put("brand", brandRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
-            row.put("itemclass", itemclassRowsMap.getOrDefault(row.getString("itemid"), new Rows()));
+
+            String[] itemclass = itemclassRowsMap.getOrDefault(row.getString("itemid"), new Rows()).toArray("itemclassname");
+            row.put("itemclass",  StringUtils.join(itemclass, ","));
         }