Merge branch 'channeloff_0518' into dev

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/TicketBoxMgrController.java

@@ -429,7 +429,7 @@ public class TicketBoxMgrController extends BaseApiController {
 						JSONObject jo = jsonArray.getJSONObject(i);
 						if(null != jo && jo.containsKey("name")
 								&& jo.containsKey("num")) {
-							drawList.add(jo.getString("name")+jo.getString("num"));
+							drawList.add(jo.getString("name")+","+jo.getString("num"));
 						}
 					}
 				}