Merge branch 'master' of http://192.168.136.45:3000/SERVER/AnsjerServer into pzb

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Controller/EquipmentManagerV3.py

@@ -42,8 +42,6 @@ class EquipmentManagerV3(View):
                 return self.do_query(userID, request_dict, response)
             elif operation == 'modify':
                 return self.do_modify(userID, request_dict, response)
-            elif operation == 'query_reset':
-                return self.do_query_reset(userID, request_dict, response)
             else:
                 return response.json(414)
         else:
@@ -284,13 +282,6 @@ class EquipmentManagerV3(View):
         else:
             return response.json(tko.code)
 
-    # 新查询设备字段
-    def do_query_reset(self, userID, request_dict, response):
-        dvqs = Device_Info.objects.filter(userID_id=userID, isExist=2)
-        dvql = dvqs.values\
-            ('id', 'NickName', 'UID', 'ChannelIndex', 'Type', 'isShare')
-        res = CommonService.qs_to_list(dvql)
-        return response.json(0, res)
 
     # 加密
     def encrypt_pwd(self,userPwd):