Merge branch 'bug-app-UpladCamera' into test

# Conflicts:
#	src/main/java/com/fdkankan/ucenter/common/BaseController.java

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

@@ -65,9 +65,8 @@ public class AppCameraController {
                 || !param.containsKey("appVersion")) {
             return Result.failure(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
         }
-        CompletableFuture.runAsync(() -> {
-            appCameraService.uploadUserCameraInfo(param.get("snCode"),param.get("cameraVersion"),param.get("appVersion"));
-        });
+        appCameraService.uploadUserCameraInfo(param.get("snCode"),param.get("cameraVersion"),param.get("appVersion"));
+
         return Result.success();
     }