Merge remote-tracking branch 'remotes/origin/peng' into test

Controller/UserController.py

@@ -687,7 +687,8 @@ class refreshTokenViewV3(TemplateView):
         request_dict = request.GET
         return self.validation(request_dict)
 
-    def delete_user_and_device(self, user_id):
+    @staticmethod
+    def delete_user_and_device(user_id):
         # 删除不同区域相同用户
         data = {'userID': user_id}
         if CONFIG_INFO == CONFIG_US: