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

Controller/EquipmentManagerV3.py

@@ -27,6 +27,7 @@ class EquipmentManagerV3(View):
 
     def post(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
+
         operation = kwargs.get('operation')
         return self.validation(request.POST, request, operation)
 
@@ -332,7 +333,7 @@ class EquipmentManagerV3(View):
                 for index, item in enumerate(result):
                     if uid == item['UID']:
                         # 加密
-                        item['View_Password'] = self.encrypt_pwd(item['View_Password'])
+                        item['View_Password'] = self.encrypt_pwd(item['View_Password']) 
                         data.append(item)
                         return response.json(0, data)
             items = []