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

Controller/FAQController.py

@@ -48,9 +48,9 @@ class FAQUploadView(View):
         if token.code != 0:
             return response.json(token.code)
 
-        # own_permission = ModelService.check_perm(userID=token.userID, permID=120)
-        # if own_permission is not True:
-        #     return response.json(404)
+        own_permission = ModelService.check_perm(userID=token.userID, permID=120)
+        if own_permission is not True:
+            return response.json(404)
 
         try:
             redisObject = RedisObject()