Merge remote-tracking branch 'origin/master'

AdminController/DeviceManagementController.py

@@ -464,6 +464,10 @@ class DeviceManagement(View):
                     uid_company_serial_qs = UIDCompanySerialModel.objects.filter(
                         company_serial__serial_number__in=serial_number_list).values('uid__uid')
                     uidList = [item[key] for item in uid_company_serial_qs for key in item]
+                    # 解绑uid数据,重置序列号状态
+                    UIDModel.objects.filter(uid__in=uidList).update(status=0)
+                    UIDCompanySerialModel.objects.filter(uid__uid__in=uidList).delete()
+                    CompanySerialModel.objects.filter(serial_number__in=serial_number_list).update(status=1)
                 # 根据删除项删除相关数据
                 if '设备信息数据' in delDataOptions:
                     Device_Info.objects.filter(UID__in=uidList).delete()