Merge branch 'task-lyh-sg' into test

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

@@ -24,7 +24,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));
     }
 

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

@@ -25,6 +25,9 @@ public class AppSceneController extends BaseController {
      */
     @PostMapping("/getAppAllSceneByPage")
     public Result getAppAllSceneByPage(@RequestBody AppSceneParam param){
+        if(param.getCameraType() == 4){
+            param.setCameraType(1);
+        }
         return Result.success( appSceneService.pageList(param));
     }
 

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

@@ -28,6 +28,9 @@ public class AppUserController {
     public Result getUserInfo(@RequestBody JSONObject param){
         String phoneNum = param.get("phoneNum") == null ? null : param.getString("phoneNum");
         Integer cameraType = param.get("cameraType") == null ? 4 : param.getInteger("cameraType");
+        if(cameraType == 4){
+            cameraType = 1;
+        }
         return Result.success( appUserService.getUserInfo(phoneNum,cameraType));
     }