Merge remote-tracking branch 'origin/master'

beeboxs/src/main/java/com/huimv/beeboxs/dahuaVideo/controller/CameraListController.java

@@ -37,7 +37,6 @@ public class CameraListController {
 
         HttpSend httpSend = new HttpSend();
         Map<String, Object>   parmap   = new HashMap<>();
-
         parmap.put("token",getToken());
         parmap.put("bindId","-1");
         parmap.put("limit",128);