Merge branch 'task-lyh-inctype2' into test

src/main/java/com/fdkankan/ucenter/controller/app/AppCameraController.java

@@ -25,7 +25,9 @@ public class AppCameraController {
     public Result getCamerasForUser(@RequestBody JSONObject param ){
         String userName = param.get("userName") == null ? null : param.getString("userName");
         Integer cameraType = param.get("cameraType") == null ? 4 : param.getInteger("cameraType");
-
+        if(cameraType == 4){
+           cameraType = 1;
+        }
         return Result.success(appCameraService.getCameraForUser(userName,cameraType));
     }